Changeset 1029

Timestamp:

12/18/08 15:33:04 (16 years ago)

Author:

msteinbi

Message:

Fixed caching (#372)

Location:

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess

Files:

• CachedDataAdapter.cs (modified) (3 diffs)
• JobAdapter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs

@@ -39 +39 @@
       new CacheT();
 
-    protected IDictionary<RowT, DataTable> parentTable =
-      new Dictionary<RowT, DataTable>();
+    protected IDictionary<long, DataTable> dataTable =
+      new Dictionary<long, DataTable>();
 
     protected ICollection<ICachedDataAdapter> parentAdapters =
@@ -131 +131 @@
     }
 
-    protected virtual void RemoveRowFromCache(RowT row) {
-      if (parentTable.ContainsKey(row)) {
-        parentTable[row].Rows.Add(row);
-        parentTable.Remove(row);
-      }
-      
+    protected virtual void RemoveRowFromCache(RowT row) {      
       cache.Rows.Remove(row);
     }
 
     protected virtual bool IsCached(RowT row) {
-      return cache.Contains<RowT>(row);
+      if (row == null)
+        return false;
+     else
+        return FindCachedById((long)row[row.Table.PrimaryKey[0]]) != null;
     }
 
@@ -173 +171 @@
         }
 
+        obj.Id = (long)row[row.Table.PrimaryKey[0]];
+
         Convert(obj, row);
 
+        if (!IsCached(row))
+          UpdateRow(row);
+        
         if (IsCached(row) &&
             !PutInCache(obj)) {
           //remove from cache
+          dataTable[obj.Id].ImportRow(row);
+          dataTable.Remove(obj.Id);
+
+          UpdateRow(row);
           RemoveRowFromCache(row);
-          UpdateRow(row);
         } else if (!IsCached(row) &&
           PutInCache(obj)) {
           //add to cache
-          if (row.Table != null) {
-            parentTable[row] = row.Table;
-            row.Table.Rows.Remove(row);
-          }
-          cache.Rows.Add(row);
+          cache.ImportRow(row);
+
+          dataTable[obj.Id] = row.Table;
+          row.Table.Rows.Remove(row);
         }
-
-        obj.Id = (long)row[row.Table.PrimaryKey[0]];
-
-        if (!IsCached(row))
-          UpdateRow(row);
       }
     }

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/JobAdapter.cs

@@ -156 +156 @@
     }
 
-    public override void SyncWithDb() {
+    public override void SyncWithDb() { 
       this.adapter.Update(this.cache);
     }
@@ -162 +162 @@
     protected override bool PutInCache(Job job) {
       return job != null
-        && job.State != State.offline 
-        && job.State != State.nullState;
+        && (job.State == State.calculating
+            || job.State == State.idle);
     }