Changeset 1128 for trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs

Timestamp:

01/14/09 17:19:08 (15 years ago)

Author:

svonolfe

Message:

Readded locking (#372)

File:

• trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs (modified) (11 diffs)

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

@@ -30 +30 @@
 namespace HeuristicLab.Hive.Server.ADODataAccess {
   abstract class CachedDataAdapter<AdapterT, ObjT, RowT, CacheT> :
-    DataAdapterBase<AdapterT, ObjT, RowT>, 
+    DataAdapterBase<AdapterT, ObjT, RowT>,
     ICachedDataAdapter
-    where CacheT: System.Data.TypedTableBase<RowT>, new()
+    where CacheT : System.Data.TypedTableBase<RowT>, new()
     where AdapterT : new()
     where RowT : System.Data.DataRow
     where ObjT : IHiveObject, new() {
-    protected CacheT cache = 
+    protected CacheT cache =
       new CacheT();
+
+    protected IDictionary<long, DataTable> dataTable =
+      new Dictionary<long, DataTable>();
 
     protected ICollection<ICachedDataAdapter> parentAdapters =
       new List<ICachedDataAdapter>();
 
-    private DataTable temp = new DataTable();
-
     protected CachedDataAdapter() {
       FillCache();
@@ -51 +52 @@
     }
 
-    protected virtual RowT FindSingleRow(Selector dbSelector, 
+    [MethodImpl(MethodImplOptions.Synchronized)]
+    protected virtual RowT FindSingleRow(Selector dbSelector,
       Selector cacheSelector) {
       RowT row =
@@ -65 +67 @@
     }
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     protected virtual IEnumerable<RowT> FindMultipleRows(Selector dbSelector,
         Selector cacheSelector) {
@@ -96 +99 @@
     }
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     protected virtual ICollection<ObjT> FindMultiple(Selector dbSelector,
       Selector cacheSelector) {
@@ -124 +128 @@
     protected abstract bool PutInCache(ObjT obj);
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     protected abstract RowT FindCachedById(long id);
 
@@ -136 +141 @@
 
     [MethodImpl(MethodImplOptions.Synchronized)]
-    protected virtual void RemoveRowFromCache(RowT row) {      
+    protected virtual void RemoveRowFromCache(RowT row) {
       cache.Rows.Remove(row);
     }
@@ -143 +148 @@
       if (row == null)
         return false;
-     else
+      else
         return FindCachedById((long)row[row.Table.PrimaryKey[0]]) != null;
     }
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     protected override RowT GetRowById(long id) {
       RowT row =
         FindCachedById(id);
-      
-      if(row == null)
+
+      if (row == null)
         row = FindSingleRow(
           delegate() {
@@ -163 +169 @@
     public override void Update(ObjT obj) {
       if (obj != null) {
-        RowT row = 
+        RowT row =
           GetRowById(obj.Id);
 
@@ -182 +188 @@
         if (!IsCached(row))
           UpdateRow(row);
-        
+
         if (IsCached(row) &&
             !PutInCache(obj)) {
           //remove from cache
-          temp.ImportRow(row);
+          dataTable[obj.Id].ImportRow(row);
+          dataTable.Remove(obj.Id);
 
           UpdateRow(row);
@@ -195 +202 @@
           cache.ImportRow(row);
 
+          dataTable[obj.Id] = row.Table;
           row.Table.Rows.Remove(row);
         }
@@ -201 +209 @@
   }
 }
+