Changeset 398 for trunk/sources/HeuristicLab.CEDMA.DB/Database.cs

Timestamp:

07/29/08 16:17:10 (16 years ago)

Author:

gkronber

Message:

removed the distinction between controller agents and normal agents. Also removed the AgentScheduler because it is not needed anymore. (ticket #204)

File:

• trunk/sources/HeuristicLab.CEDMA.DB/Database.cs (modified) (11 diffs)

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

@@ -55 +55 @@
             }
             using(DbCommand cmd = cnn.CreateCommand()) {
-              cmd.CommandText = "CREATE TABLE Agent (ID integer primary key autoincrement, ProjectId integer, ParentAgentId integer, Name text, Status text default "+ProcessStatus.Unknown+", ControllerAgent integer, CreationTime DateTime, RawData Blob)";
+              cmd.CommandText = "CREATE TABLE Agent (ID integer primary key autoincrement, ProjectId integer, ParentAgentId integer, Name text, Status text default "+ProcessStatus.Unknown+", CreationTime DateTime, RawData Blob)";
               cmd.Transaction = t;
               cmd.ExecuteNonQuery();
@@ -73 +73 @@
     #endregion
 
-    #region insert agent/run/result/sub-result
-    public long InsertAgent(long? parentAgentId, string name, bool controllerAgent, byte[] rawData) {
+    #region insert agent/result/sub-result
+    public long InsertAgent(long? parentAgentId, string name, byte[] rawData) {
       rwLock.EnterWriteLock();
       try {
@@ -83 +83 @@
             using(DbCommand c = cnn.CreateCommand()) {
               c.Transaction = t;
-              c.CommandText = "Insert into Agent (Name, ParentAgentId, ControllerAgent, CreationTime, RawData) values (@Name, @ParentAgentId, @ControllerAgent, @CreationTime, @RawData); select last_insert_rowid()";
+              c.CommandText = "Insert into Agent (Name, ParentAgentId, CreationTime, RawData) values (@Name, @ParentAgentId, @CreationTime, @RawData); select last_insert_rowid()";
               DbParameter nameParam = c.CreateParameter();
               nameParam.ParameterName = "@Name";
@@ -92 +92 @@
               parentParam.Value = parentAgentId;
               c.Parameters.Add(parentParam);
-              DbParameter controllerParam = c.CreateParameter();
-              controllerParam.ParameterName = "@ControllerAgent";
-              controllerParam.Value = controllerAgent;
-              c.Parameters.Add(controllerParam);
               DbParameter creationTimeParam = c.CreateParameter();
               creationTimeParam.ParameterName = "@CreationTime";
@@ -284 +280 @@
     #endregion
 
-    #region get agent/run/result/sub-result
+    #region get agent/result/sub-result
 
     public ICollection<AgentEntry> GetAgents(ProcessStatus status) {
@@ -293 +289 @@
           cnn.Open();
           SQLiteCommand c = cnn.CreateCommand();
-          c.CommandText = "Select id, name, ControllerAgent, rawdata from Agent where Status=@Status";
+          c.CommandText = "Select id, name, rawdata from Agent where Status=@Status";
           DbParameter statusParameter = c.CreateParameter();
           statusParameter.ParameterName = "@Status";
@@ -305 +301 @@
             agent.Id = r.GetInt32(0);
             agent.Name = r.IsDBNull(1)?"":r.GetString(1);
-            agent.ControllerAgent = r.GetBoolean(2);
-            agent.RawData = (byte[])r.GetValue(3);
+            agent.RawData = (byte[])r.GetValue(2);
             agents.Add(agent);
           }
@@ -323 +318 @@
           cnn.Open();
           using(DbCommand c = cnn.CreateCommand()) {
-            c.CommandText = "Select id, name, status, ControllerAgent, rawdata from Agent where ParentAgentId isnull";
+            c.CommandText = "Select id, name, status, rawdata from Agent where ParentAgentId isnull";
             using(DbDataReader r = c.ExecuteReader()) {
               while(r.Read()) {
@@ -331 +326 @@
                 agent.Name = r.IsDBNull(1)?"-":r.GetString(1);
                 agent.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(2));
-                agent.ControllerAgent = r.GetBoolean(3);
-                agent.RawData = (byte[])r.GetValue(4);
+                agent.RawData = (byte[])r.GetValue(3);
                 agents.Add(agent);
               }
@@ -351 +345 @@
           cnn.Open();
           using(DbCommand c = cnn.CreateCommand()) {
-            c.CommandText = "Select id, name, status, controllerAgent, rawdata from Agent where ParentAgentId=@ParentAgentId";
+            c.CommandText = "Select id, name, status, rawdata from Agent where ParentAgentId=@ParentAgentId";
             DbParameter parentParameter = c.CreateParameter();
             parentParameter.ParameterName = "@ParentAgentId";
@@ -364 +358 @@
                 agent.Name = r.IsDBNull(1)?"-":r.GetString(1);
                 agent.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(2));
-                agent.ControllerAgent = r.GetBoolean(3);
-                agent.RawData = (byte[])r.GetValue(4);
+                agent.RawData = (byte[])r.GetValue(3);
                 agents.Add(agent);
               }