Changeset 1094 for trunk/sources/HeuristicLab.Hive.Server.ADODataAccess

Timestamp:

01/08/09 15:46:53 (16 years ago)

Author:

svonolfe

Message:

Improved caching (#372)

Location:

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess

Files:

• CachedDataAdapter.cs (modified) (4 diffs)
• ClientAdapter.cs (modified) (1 diff)
• JobAdapter.cs (modified) (1 diff)
• ResourceAdapter.cs (modified) (1 diff)

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

@@ -39 +39 @@
       new CacheT();
 
-    protected IDictionary<long, DataTable> dataTable =
-      new Dictionary<long, DataTable>();
-
     protected ICollection<ICachedDataAdapter> parentAdapters =
       new List<ICachedDataAdapter>();
@@ -130 +127 @@
     [MethodImpl(MethodImplOptions.Synchronized)]
     protected abstract RowT FindCachedById(long id);
+
+    protected abstract DataTable GetDataTable();
 
     [MethodImpl(MethodImplOptions.Synchronized)]
@@ -192 +191 @@
             !PutInCache(obj)) {
           //remove from cache
-          dataTable[obj.Id].ImportRow(row);
-          dataTable.Remove(obj.Id);
+          GetDataTable().ImportRow(row);
 
           UpdateRow(row);
@@ -202 +200 @@
           cache.ImportRow(row);
 
-          dataTable[obj.Id] = row.Table;
-          row.Table.Rows.Remove(row);
+          GetDataTable().Rows.Remove(row);
         }
       }

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

@@ -200 +200 @@
         new Selector(adapter.GetData),
         new Selector(cache.AsEnumerable<dsHiveServer.ClientRow>));
+    }
+
+    protected override System.Data.DataTable GetDataTable() {
+      return data;
     }
     #endregion

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

@@ -188 +188 @@
         new Selector(adapter.GetData),
         new Selector(cache.AsEnumerable<dsHiveServer.JobRow>));
+    }
+
+    protected override System.Data.DataTable GetDataTable() {
+      return data;
     }
 

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

@@ -126 +126 @@
         new Selector(cache.AsEnumerable<dsHiveServer.ResourceRow>));
     }
+
+    protected override System.Data.DataTable GetDataTable() {
+      return data;
+    }
     #endregion