Changeset 1149

Timestamp:

01/15/09 17:11:13 (15 years ago)

Author:

msteinbi

Message:

Improved caching (#372)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/ClientAdapter.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.ADODataAccess/JobAdapter.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.ADODataAccess/ResourceAdapter.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/JobManager.cs (modified) (1 diff)

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

@@ -141 +141 @@
     protected abstract void FillCache();
 
-    public abstract void SyncWithDb();
+    protected abstract void SynchronizeWithDb();
 
     protected abstract bool PutInCache(ObjT obj);
@@ -147 +147 @@
     protected abstract RowT FindCachedById(long id);
 
+    public void SyncWithDb() {
+      foreach (ICachedDataAdapter parent in this.parentAdapters) {        
+        parent.SyncWithDb();
+      }
+
+      cacheLock.AcquireReaderLock(Timeout.Infinite);
+
+      this.SynchronizeWithDb();
+
+      cacheLock.ReleaseReaderLock();
+    }
+
     void CachedDataAdapter_OnUpdate(object sender, EventArgs e) {
-      foreach (ICachedDataAdapter parent in this.parentAdapters) {
-        parent.SyncWithDb();
-      }
-
-      cacheLock.AcquireReaderLock(Timeout.Infinite);
-
       this.SyncWithDb();
-
-      cacheLock.ReleaseReaderLock();
     }
 
@@ -162 +166 @@
       if (row == null)
         return false;
-      else
-        return FindCachedById((long)row[row.Table.PrimaryKey[0]]) != null;
+      else {
+        cacheLock.AcquireReaderLock(Timeout.Infinite);
+
+        bool cached = FindCachedById((long)row[row.Table.PrimaryKey[0]]) != null;
+
+        cacheLock.ReleaseReaderLock();
+
+        return cached;
+      }
     }
 

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

@@ -187 +187 @@
     }
 
-    public override void SyncWithDb() {
+    protected override void SynchronizeWithDb() {
       Adapter.Update(cache);
     }

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

@@ -170 +170 @@
     }
 
-    public override void SyncWithDb() { 
+    protected override void SynchronizeWithDb() { 
       this.Adapter.Update(cache);
     }

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

@@ -101 +101 @@
     }
 
-    public override void SyncWithDb() {
+    protected override void SynchronizeWithDb() {
       Adapter.Update(cache);
     }

trunk/sources/HeuristicLab.Hive.Server.Core/JobManager.cs

@@ -64 +64 @@
         job.Client = null;
         job.Percentage = lastJobResult.Percentage;
-        job.State = State.idle;
+        job.State = State.offline;
         job.SerializedJob = lastJobResult.Result;
       } else {
         job.Client = null;
         job.Percentage = 0;
-        job.State = State.idle;
+        job.State = State.offline;
       }
       jobAdapter.Update(job);