Changeset 2099 for trunk/sources/HeuristicLab.Hive.Server.Core

Timestamp:

06/25/09 13:54:15 (15 years ago)

Author:

svonolfe

Message:

Further avoided out of memory exceptions by updating the JobResult DAO (#372)

Location:

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

Files:

• ClientCommunicator.cs (modified) (2 diffs)
• ClientFacade.cs (modified) (2 diffs)
• ExecutionEngineFacade.cs (modified) (1 diff)
• JobManager.cs (modified) (9 diffs)
• ServerConsoleFacade.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

@@ -385 +385 @@
         if (job2Calculate != null) {
           SerializedJob computableJob =
-            jobAdapter.GetComputableJob(job2Calculate.Id);
+            jobAdapter.GetSerializedJob(job2Calculate.Id);
 
           response.Job = computableJob;
@@ -492 +492 @@
         }
 
-        jobAdapter.UpdateComputableJob(job);
+        jobAdapter.UpdateSerializedJob(job);
 
         List<JobResult> jobResults = new List<JobResult>(
-          jobResultAdapter.GetResultsOf(job.JobInfo));
+          jobResultAdapter.GetResultsOf(job.JobInfo.Id));
         foreach (JobResult currentResult in jobResults)
           jobResultAdapter.Delete(currentResult);
 
-        JobResult jobResult =
-          new JobResult();
+        SerializedJobResult serializedjobResult =
+          new SerializedJobResult();
+        JobResult jobResult = new JobResult();
         jobResult.ClientId = client.Id;
         jobResult.JobId = job.JobInfo.Id;
-        jobResult.Result = result;
         jobResult.Percentage = percentage;
         jobResult.Exception = exception;
         jobResult.DateFinished = DateTime.Now;
-
-        jobResultAdapter.Update(jobResult);
+        serializedjobResult.JobResult = jobResult;
+        serializedjobResult.SerializedJobResultData =
+          result;
+
+        jobResultAdapter.UpdateSerializedJobResult(serializedjobResult);
         jobAdapter.Update(job.JobInfo);
 

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientFacade.cs

@@ -97 +97 @@
       BinaryFormatter formatter =
           new BinaryFormatter();
-      JobResult result = (JobResult)formatter.Deserialize(stream);
+      SerializedJobResult result = 
+        (SerializedJobResult)formatter.Deserialize(stream);
 
       return this.StoreFinishedJobResult(
-          result.ClientId,
-          result.JobId,
-          result.Result,
-          result.Percentage,
-          result.Exception);
+          result.JobResult.ClientId,
+          result.JobResult.JobId,
+          result.SerializedJobResultData,
+          result.JobResult.Percentage,
+          result.JobResult.Exception);
     } 
 
@@ -110 +111 @@
       BinaryFormatter formatter =
           new BinaryFormatter();
-      JobResult result = (JobResult)formatter.Deserialize(stream);
+      SerializedJobResult result = (SerializedJobResult)formatter.Deserialize(stream);
 
       return this.ProcessSnapshot(
-          result.ClientId,
-          result.JobId,
-          result.Result,
-          result.Percentage,
-          result.Exception);
+          result.JobResult.ClientId,
+          result.JobResult.JobId,
+          result.SerializedJobResultData,
+          result.JobResult.Percentage,
+          result.JobResult.Exception);
     }
 

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ExecutionEngineFacade.cs

@@ -44 +44 @@
     }
 
-    public ResponseObject<JobResult> GetLastResult(Guid jobId, bool requested) {
-      return jobManager.GetLastJobResultOf(jobId, requested);
+    public ResponseObject<SerializedJobResult> 
+      GetLastSerializedResult(Guid jobId, bool requested) {
+      return jobManager.GetLastSerializedJobResultOf(jobId, requested);
     }
 

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

@@ -48 +48 @@
     }
 
-    private JobResult GetLastJobResult(Job job) {
+    private JobResult GetLastJobResult(Guid jobId) {
       ISession session = factory.GetSessionForCurrentThread();
 
@@ -55 +55 @@
             session.GetDataAdapter<JobResult, IJobResultsAdapter>();
 
-        return jobResultAdapter.GetLastResultOf(job);
+        return jobResultAdapter.GetLastResultOf(jobId);
       }
       finally {
@@ -70 +70 @@
         IJobAdapter jobAdapter =
             session.GetDataAdapter<Job, IJobAdapter>();
+
+        IJobResultsAdapter jobResultsAdapter =
+          session.GetDataAdapter<JobResult, IJobResultsAdapter>();
 
         tx = session.BeginTransaction();
@@ -79 +82 @@
             job;
 
-          JobResult lastJobResult = GetLastJobResult(job);
-          if (lastJobResult != null) {
-            computableJob.JobInfo.Percentage = lastJobResult.Percentage;
-            computableJob.SerializedJobData = lastJobResult.Result;
-
-            jobAdapter.UpdateComputableJob(computableJob);
+          JobResult lastResult = 
+            GetLastJobResult(job.Id);
+
+          if (lastResult != null) {
+            SerializedJobResult lastJobResult =
+              jobResultsAdapter.GetSerializedJobResult(lastResult.Id);
+
+            if (lastJobResult != null) {
+              computableJob.JobInfo.Percentage = lastJobResult.JobResult.Percentage;
+              computableJob.SerializedJobData = lastJobResult.SerializedJobResultData;
+
+              jobAdapter.UpdateSerializedJob(computableJob);
+            } else {
+              computableJob.JobInfo.Percentage = 0;
+            }
           } else {
             computableJob.JobInfo.Percentage = 0;
@@ -223 +235 @@
 
           job.JobInfo.DateCreated = DateTime.Now;
-          jobAdapter.UpdateComputableJob(job);
+          jobAdapter.UpdateSerializedJob(job);
           response.Success = true;
           response.Obj = job.JobInfo;
@@ -271 +283 @@
     }
 
-    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId, bool requested) {
-      ISession session = factory.GetSessionForCurrentThread();
+    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId) {
+       ResponseObject<JobResult> result = 
+        new ResponseObject<JobResult>();
+
+       result.Obj =
+         GetLastJobResult(jobId);
+       result.Success =
+         result.Obj != null;
+
+       return result;
+    }
+
+    public ResponseObject<SerializedJobResult>
+      GetLastSerializedJobResultOf(Guid jobId, bool requested) {
+      ISession session = factory.GetSessionForCurrentThread();
+
+      ITransaction tx = null;
 
       try {
@@ -278 +305 @@
             session.GetDataAdapter<Job, IJobAdapter>();
 
-        ResponseObject<JobResult> response = new ResponseObject<JobResult>();
+        IJobResultsAdapter jobResultsAdapter =
+          session.GetDataAdapter<JobResult, IJobResultsAdapter>();
+
+        tx = session.BeginTransaction();
+
+        ResponseObject<SerializedJobResult> response =
+          new ResponseObject<SerializedJobResult>();
 
         Job job = jobAdapter.GetById(jobId);
@@ -284 +317 @@
           response.Success = true;
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
+
+          tx.Commit();
+          
           return response;
         }
-          
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
-        response.Obj = GetLastJobResult(job);
-
-        return response;
-      }
-      finally {
-        if(session != null)
-          session.EndSession();
-      }
-    }
+
+        JobResult lastResult =
+          jobResultsAdapter.GetLastResultOf(job.Id);
+
+        if (lastResult != null) {
+          response.Success = true;
+          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
+          response.Obj =
+            jobResultsAdapter.GetSerializedJobResult(
+              lastResult.Id);          
+        } else {
+          response.Success = false;
+        }
+
+        tx.Commit();
+        return response;
+      }
+      catch (Exception ex) {
+        if (tx != null)
+          tx.Rollback();
+        throw ex;
+      }
+      finally {
+        if (session != null)
+          session.EndSession();
+      }
+    }
+
 
     public Response RequestSnapshot(Guid jobId) {
@@ -385 +437 @@
           return response;
         }
-        response.List = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
+        response.List = new List<JobResult>(jobResultAdapter.GetResultsOf(job.Id));
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs

@@ -104 +104 @@
     }
 
-    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId, bool requested) {
+    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId) {
       secMan.Authorize("AccessJobResults", sessionID, jobId);
-      return jobManager.GetLastJobResultOf(jobId, requested);
+      return jobManager.GetLastJobResultOf(jobId);
+    }
+
+    public ResponseObject<SerializedJobResult> GetLastSerializedJobResultOf(Guid jobId, bool requested) {
+      secMan.Authorize("AccessJobResults", sessionID, jobId);
+      return jobManager.GetLastSerializedJobResultOf(jobId, requested);
     }