Changeset 2053 for trunk/sources/HeuristicLab.CEDMA.Core

Timestamp:

06/17/09 13:49:05 (15 years ago)

Author:

gkronber

Message:

Removed lazy loading of problem data and made adds of datasets and models atomic. #656 (CEDMA server should handle only one data set (problem) at a time)

Location:

trunk/sources/HeuristicLab.CEDMA.Core/3.3

Files:

• DataSet.cs (modified) (4 diffs)
• StoreProxy.cs (modified) (1 diff)

trunk/sources/HeuristicLab.CEDMA.Core/3.3/DataSet.cs

@@ -47 +47 @@
     public Problem Problem {
       get {
-        // lazy loading of problem from DB
-        if (problem == null) {
-          var persistedData = Store.Query(
-            "<" + Ontology.CedmaNameSpace + Guid + "> <" + Ontology.SerializedData.Uri + "> ?SerializedData .", 0, 10);
-          if (persistedData.Count() == 1) {
-            Literal persistedLiteral = (Literal)persistedData.First().Get("SerializedData");
-            this.problem = (Problem)PersistenceManager.RestoreFromGZip(Convert.FromBase64String((string)persistedLiteral.Value));
-          } else
-            this.problem = new Problem(); // no entry in the DB => create a new problem
-        }
         return problem;
       }
@@ -71 +61 @@
       name = "Data set";
       activated = false;
+      problem = new Problem();
     }
 
@@ -78 +69 @@
       guid = new Guid(dataSetEntity.Uri.Remove(0, Ontology.CedmaNameSpace.Length));
       name = guid.ToString();
+      var persistedData = Store.Query(
+        "<" + Ontology.CedmaNameSpace + Guid + "> <" + Ontology.SerializedData.Uri + "> ?SerializedData .", 0, 10);
+      if (persistedData.Count() == 1) {
+        Literal persistedLiteral = (Literal)persistedData.First().Get("SerializedData");
+        problem = (Problem)PersistenceManager.RestoreFromGZip(Convert.FromBase64String((string)persistedLiteral.Value));
+      } else problem = new Problem();
       activated = true;
     }
@@ -83 +80 @@
     public void Activate() {
       Entity myEntity = new Entity(Ontology.CedmaNameSpace + Guid);
-      Store.Add(new Statement(myEntity, Ontology.InstanceOf, Ontology.TypeDataSet));
-      Store.Add(new Statement(myEntity, Ontology.SerializedData, new Literal(Convert.ToBase64String(PersistenceManager.SaveToGZip(problem)))));
-      Store.Add(new Statement(myEntity, Ontology.Name, new Literal(name)));
+      Store.AddRange(
+        new Statement[] { 
+          new Statement(myEntity, Ontology.InstanceOf, Ontology.TypeDataSet),
+          new Statement(myEntity, Ontology.SerializedData, new Literal(Convert.ToBase64String(PersistenceManager.SaveToGZip(problem)))),
+          new Statement(myEntity, Ontology.Name, new Literal(name))
+        });
       activated = true;
     }

trunk/sources/HeuristicLab.CEDMA.Core/3.3/StoreProxy.cs

@@ -76 +76 @@
     }
 
+    public void AddRange(ICollection<Statement> statements) {
+      ExecuteSavely(() => { store.AddRange(statements); return 1.0; });
+    }
+
     public ICollection<VariableBindings> Query(ICollection<Statement> query, int page, int pageSize) {
       return ExecuteSavely(() => store.Query(query, page, pageSize));