Changeset 416

Timestamp:

07/31/08 17:42:20 (16 years ago)

Author:

gkronber

Message:

worked on #211 (Full operator-graphs are stored multiple times in the database even though most of it is static anyway)

By introducing a table of operators in the CEDMA database.

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Core/DatabaseOperatorLibrary.cs (added)
• HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.DB.Interfaces/HeuristicLab.CEDMA.DB.Interfaces.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.DB.Interfaces/IDatabase.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.DB.Interfaces/OperatorEntry.cs (added)
• HeuristicLab.CEDMA.DB/Database.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

@@ -62 +62 @@
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="DatabaseOperatorLibrary.cs" />
     <Compile Include="Result.cs" />
     <Compile Include="IResult.cs" />

trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/HeuristicLab.CEDMA.DB.Interfaces.csproj

@@ -55 +55 @@
   <ItemGroup>
     <Compile Include="AgentEntry.cs" />
+    <Compile Include="OperatorEntry.cs" />
     <Compile Include="ProcessStatus.cs" />
     <Compile Include="ResultEntry.cs" />

trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/IDatabase.cs

@@ -48 +48 @@
     long InsertSubResult(long resultId, string summary, string description, byte[] rawData);
 
+    [OperationContract]
+    long InsertOperator(string name, string rawData);
+
     // should be replaced by more powerful querying interface (LINQ provider?)
     [OperationContract]
@@ -61 +64 @@
     ICollection<ResultEntry> GetSubResults(long parentResultId);
 
+    [OperationContract]
+    ICollection<OperatorEntry> GetOperators();
+
   }
 }

trunk/sources/HeuristicLab.CEDMA.DB/Database.cs

@@ -61 +61 @@
             using(DbCommand cmd = cnn.CreateCommand()) {
               cmd.CommandText = "CREATE TABLE Result (ID integer primary key autoincrement, AgentId integer, ParentResultId integer, Summary text, Description text, CreationTime DateTime, RawData Blob)";
+              cmd.Transaction = t;
+              cmd.ExecuteNonQuery();
+            }
+            using(DbCommand cmd = cnn.CreateCommand()) {
+              cmd.CommandText = "CREATE TABLE Operator (ID integer primary key autoincrement, Name text, RawData text)";
               cmd.Transaction = t;
               cmd.ExecuteNonQuery();
@@ -194 +199 @@
       }
     }
+
+    public long InsertOperator(string name, string rawData) {
+      rwLock.EnterWriteLock();
+      try {
+        using(DbConnection cnn = new SQLiteConnection(connectionString)) {
+          cnn.Open();
+          long id;
+          using(DbTransaction t = cnn.BeginTransaction()) {
+            using(DbCommand c = cnn.CreateCommand()) {
+              c.Transaction = t;
+              c.CommandText = "Insert into Operator (Name, RawData) values (@Name, @RawData); select last_insert_rowid()";
+              DbParameter nameParam = c.CreateParameter();
+              nameParam.ParameterName = "@Name";
+              nameParam.Value = name;
+              c.Parameters.Add(nameParam);
+              DbParameter dataParam = c.CreateParameter();
+              dataParam.ParameterName = "@RawData";
+              dataParam.Value = rawData;
+              c.Parameters.Add(dataParam);
+              id = (long)c.ExecuteScalar();
+            }
+            t.Commit();
+            return id;
+          }
+        }
+      } finally {
+        rwLock.ExitWriteLock();
+      }
+    }
     #endregion
 
@@ -433 +467 @@
       return results;
     }
+
+    public ICollection<OperatorEntry> GetOperators() {
+      rwLock.EnterReadLock();
+      List<OperatorEntry> operators = new List<OperatorEntry>();
+      try {
+        using(DbConnection cnn = new SQLiteConnection(connectionString)) {
+          cnn.Open();
+          using(DbCommand c = cnn.CreateCommand()) {
+            c.CommandText = "Select id, name, rawdata from Operator";
+            using(DbDataReader r = c.ExecuteReader()) {
+              while(r.Read()) {
+                OperatorEntry op = new OperatorEntry();
+                op.Id = r.GetInt32(0);
+                op.Name = r.IsDBNull(1) ? "-" : r.GetString(1);
+                op.RawData = r.GetString(2);
+                operators.Add(op);
+              }
+            }
+          }
+        }
+      } finally {
+        rwLock.ExitReadLock();
+      }
+      return operators;
+    }
     #endregion
   }