Changeset 9227 for branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs

Timestamp:

02/19/13 08:46:01 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Experiments will be saved as JSON elements within the blob store.
• Added simple model and JSON converters.
• Backend stores and runs experiments.
• Updated interfaces to save/read experiments.
• Added a binding to automatically map incoming JSON ajax requests to experiment models.
• Added the javascript DatatypeMapper to map parameter inputs to the right html elements and vice versa.
• Added smartwizard to generate Wizards for creating new experiments (New.cshtml).

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs (modified) (8 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs

@@ -9 +9 @@
 using System.Diagnostics;
 using HeuristicLab.Services.Optimization.ControllerService.Model;
+using HeuristicLab.Services.Optimization.ControllerService.Parsers;
 
 namespace HeuristicLab.Services.Optimization.ControllerService.Azure {
@@ -15 +16 @@
     public static readonly string SCENARIO_BLOB_CONTAINER = "scenario";
     public static readonly string EXPERIMENT_TABLE = "Experiment";
+    public static readonly string EXPERIMENT_BLOB_CONTAINER = "experiment";
     public static readonly string CLOUD_SETTINGS_KEY = "Cloudia.WindowsAzure.Storage";
+
+    
   }
 
@@ -97 +101 @@
     }
 
-    public ExperimentEntity(string user, Experiment experiment) {
+    public ExperimentEntity(string user, string experimentName, string experimentUrl) {
       PartitionKey = "ScenarioPartition";
-      RowKey = user + "_" + experiment.Name;
-      var scenarios = "";
-      foreach (var scen in experiment.Scenarios) {
-        scenarios += scen.Id + ",";
-      }
-      Scenarios = scenarios.Remove(scenarios.Length - 1);
+      RowKey = user + "_" + experimentName;      
       User = user;
+      ExperimentJsonUrl = experimentUrl;
     }
 
     public string User { get; set; }
 
-    public string Scenarios { get; set; }
+    public string ExperimentJsonUrl { get; set; }
 
   }
@@ -122 +122 @@
         return false;
 
-      TableServiceContext serviceContext = TableClient.GetDataServiceContext();
-      TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
-      var entity = new ExperimentEntity(username, experiment);
+      // TODO: Save the whole experiment, not just the algorithm names!!!
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      // For now we store it as JSON element in the blob store
+      // TODO: Make sure, that all required properties are part of the experiment!!
+      var experimentJson = AlgorithmConverter.ConvertJson(experiment);
+      Guid experimentJsonGuid = Guid.NewGuid();
+      var experimentJsonId = experiment.Name + "_" + experimentJsonGuid.ToString();
+      var blob = container.GetBlobReference(experimentJsonId);      
+      blob.UploadText(experimentJson);
+
+      TableServiceContext serviceContext = TableClient.GetDataServiceContext();      
+      TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
+      var entity = new ExperimentEntity(username, experiment.Name, blob.Uri.ToString());
       serviceContext.AddObject(AzureConstants.EXPERIMENT_TABLE, entity);
       serviceContext.SaveChangesWithRetries();
@@ -139 +150 @@
       if (entity == null)
         return false;
+
+      if (entity.ExperimentJsonUrl != null) {
+        CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+        container.CreateIfNotExist();
+        var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+        blob.DeleteIfExists();
+      }
 
       serviceContext.DeleteObject(entity);
@@ -156 +174 @@
       }
 
-      var exp = Convert(entity);
-      return exp;
-    }
-
-    private Experiment Convert(ExperimentEntity entity) {
-      var exp = new Experiment() { Name = entity.RowKey.Split('_')[1] };
-      foreach (var scenarioName in entity.Scenarios.Split(','))
-        exp.Scenarios.Add(new OptimizationScenario() { Id = scenarioName });
-      return exp;
-    }
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+      return AlgorithmConverter.ConvertExperimentSimple(blob.DownloadText());
+    }
+
+    //private Experiment Convert(ExperimentEntity entity, string entityJson) {
+    //  // TODO: Read the whole experiment, not just the names!
+    //  var exp = new Experiment() { Name = entity.RowKey.Split('_')[1] };
+    //  foreach (var scenarioName in entity.Algorithms.Split(','))
+    //    exp.Algorithm.Add(new Algorithm() { Name = scenarioName });
+    //  return exp;
+    //}
 
     public IEnumerable<Model.Experiment> GetExperiments(string user) {
@@ -174 +195 @@
                     select e).ToList();
       var experiments = new List<Experiment>();
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+      container.CreateIfNotExist();
       foreach (var entity in entites) {
-        experiments.Add(Convert(entity));
+        var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+        experiments.Add(AlgorithmConverter.ConvertExperimentSimple(blob.DownloadText()));
       }
       return experiments;
+    }
+
+
+    public Experiment GetExperimentByName(string username, string scenario) {
+      TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+      TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
+      var entity = (from e in serviceContext.CreateQuery<ExperimentEntity>(AzureConstants.EXPERIMENT_TABLE)
+                      where e.RowKey == username + "_" + scenario
+                      select e).FirstOrDefault();
+      if (entity == null || entity.ExperimentJsonUrl == null) {
+        return null;
+      }
+
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+      var exp = AlgorithmConverter.ConvertExperimentSimple(blob.DownloadText());
+      return exp;
     }
   }
@@ -224 +266 @@
       get {
         if (expDao == null) {
-          expDao = new ExperimentDao() { TableClient = StorageAccount.CreateCloudTableClient() };
+          expDao = new ExperimentDao() { TableClient = StorageAccount.CreateCloudTableClient(), BlobClient = StorageAccount.CreateCloudBlobClient() };
         }
         return expDao;