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

Timestamp:

06/23/09 11:35:41 (16 years ago)

Author:

svonolfe

Message:

Avoid out of memory exceptions related to job objects (#372)

Location:

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2

Files:

• ClientAdapter.cs (modified) (1 diff)
• JobAdapter.cs (modified) (3 diffs)

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

@@ -189 +189 @@
 
     public ClientInfo GetByName(string name) {
-      ClientInfo client = new ClientInfo();
-      Resource res =
-        ResAdapter.GetByName(name);
-
-      return GetById(res.Id);
+      return (ClientInfo)
+        base.doInTransaction(
+        delegate() {
+          ClientInfo client = new ClientInfo();
+          Resource res =
+            ResAdapter.GetByName(name);
+
+          return GetById(res.Id);
+        });
     }
 
     protected override bool doDelete(ClientInfo client) {
-      bool success = false;
-      
-      if (client != null) {
-        dsHiveServer.ClientRow row =
-          GetRowById(client.Id);
-
-        if (row != null) {
-          success = base.doDelete(client) && 
-            ResAdapter.Delete(client);
-        }
-      }
-
-      return success;
+      return (bool)base.doInTransaction(
+        delegate() {
+          bool success = false;
+
+          if (client != null) {
+            dsHiveServer.ClientRow row =
+              GetRowById(client.Id);
+
+            if (row != null) {
+              success = base.doDelete(client) &&
+                ResAdapter.Delete(client);
+            }
+          }
+
+          return success;
+        });
     }
 

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

@@ -166 +166 @@
           job.Percentage = 0.0;
 
-        if (!row.IsSerializedJobNull())
-          job.SerializedJob = row.SerializedJob;
-        else
-          job.SerializedJob = null;
-
         if (!row.IsDateCreatedNull())
           job.DateCreated = row.DateCreated;
@@ -255 +250 @@
 
         row.Percentage = job.Percentage;
-
-        row.SerializedJob = job.SerializedJob;
 
         if (job.DateCreated != DateTime.MinValue)
@@ -422 +415 @@
     }
 
+    /// <summary>
+    /// Gets the computable job with the secified jobId
+    /// </summary>
+    /// <param name="jobId"></param>
+    /// <returns></returns>
+    public ComputableJob GetComputableJob(Guid jobId) {
+      return (ComputableJob)base.doInTransaction(
+        delegate() {
+          ComputableJob job =
+            new ComputableJob();
+
+          job.JobInfo = GetById(jobId);
+          dsHiveServer.JobRow row
+            = GetRowById(jobId);
+
+          if (job.JobInfo != null && row != null &&
+            !row.IsSerializedJobNull()) {
+
+            job.SerializedJob =
+              row.SerializedJob;
+
+            return job;
+          } else {
+            return null;
+          }
+        });
+    }
+
+    /// <summary>
+    /// Saves or update the computable job
+    /// </summary>
+    /// <param name="jobId"></param>
+    public void UpdateComputableJob(ComputableJob job) {
+      if(job != null && 
+        job.JobInfo != null) {
+        base.doInTransaction(
+          delegate() {
+            dsHiveServer.JobRow row
+              = GetRowById(job.JobInfo.Id);
+
+            if (row != null) {
+              Update(job.JobInfo);
+              row.SerializedJob =
+                job.SerializedJob;
+
+              base.Adapter.Update(row);
+            }
+
+            return true;
+          });
+      }
+      
+    }
+
     #endregion
   }