Changeset 4170 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3

Timestamp:

08/06/10 09:20:18 (14 years ago)

Author:

cneumuel

Message:

refactoring of Result-Polling of HiveExperiment, polling is now much faster and code is cleaner (1092#)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3

Files:

• . (modified) (1 prop)
• ClientCommunicator.cs (modified) (5 diffs)
• Facades/ClientFacade.cs (modified) (2 diffs)
• Facades/ExecutionEngineFacade.cs (modified) (1 diff)
• Facades/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core-3.3.csproj (modified) (1 diff)
• JobManager.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Server.Core-3.3.csproj.user

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Server.Core-3.3.csproj.user

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs

@@ -469 +469 @@
       //tx = session.BeginTransaction();
 
-      ResponseResultReceived response =
-        ProcessJobResult(
-        result.ClientId,
-        result.JobId,
-        new byte[] { },
-        result.Percentage,
-        result.Exception,
-        finished);
+      ResponseResultReceived response = ProcessJobResult(result.ClientId, result.JobId, new byte[] { }, result.Percentage, result.Exception, finished);
 
       if (response.Success) {
@@ -509 +502 @@
       Guid jobId,
       byte[] result,
-      double percentage,
-      Exception exception,
+      double? percentage,
+      string exception,
       bool finished) {
 
@@ -522 +515 @@
       if (job != null) {
         job.JobInfo = DaoLocator.JobDao.FindById(jobId);
-        job.JobInfo.Client = job.JobInfo.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
-      }
-
-      if (job == null && job.JobInfo != null) {
+        if (job.JobInfo != null) {
+          job.JobInfo.Client = job.JobInfo.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
+        }
+      }
+      
+      if (job != null && job.JobInfo == null) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
@@ -591 +586 @@
       job.JobInfo.Percentage = percentage;
 
-      if (exception != null) {
+      if (!string.IsNullOrEmpty(exception)) {
         job.JobInfo.State = State.Failed;
-        job.JobInfo.Exception = exception.ToString();
+        job.JobInfo.Exception = exception;
         job.JobInfo.DateFinished = DateTime.Now;
       } else if (finished) {
@@ -629 +624 @@
       byte[] result,
       double percentage,
-      Exception exception) {
+      string exception) {
 
       return ProcessJobResult(clientId, jobId, result, percentage, exception, true);
     }
 
-    public ResponseResultReceived ProcessSnapshot(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception) {
+    public ResponseResultReceived ProcessSnapshot(Guid clientId, Guid jobId, byte[] result, double percentage, string exception) {
       return ProcessJobResult(clientId, jobId, result, percentage, exception, false);
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ClientFacade.cs

@@ -67 +67 @@
     }
 
-    public ResponseResultReceived StoreFinishedJobResult(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception) {
+    public ResponseResultReceived StoreFinishedJobResult(Guid clientId, Guid jobId, byte[] result, double percentage, string exception) {
       using (contextFactory.GetContext()) {
         return clientCommunicator.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);
@@ -89 +89 @@
     }
 
-    public ResponseResultReceived ProcessSnapshot(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception) {
+    public ResponseResultReceived ProcessSnapshot(Guid clientId, Guid jobId, byte[] result, double percentage, string exception) {
       using (contextFactory.GetContext()) {
         return clientCommunicator.ProcessSnapshot(clientId, jobId, result, percentage, exception); 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs

@@ -75 +75 @@
       }
     }
+
+
+    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+      using (contextFactory.GetContext(false)) {
+        return jobManager.GetAllJobResults(jobIds);
+      }
+    }
     #endregion
+
+
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -154 +154 @@
     }
 
-    public ResponseList<JobResult> GetAllJobResults(Guid jobId) {
-      using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobResults", sessionID, jobId);
-        return jobManager.GetAllJobResults(jobId);
+    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+      using (contextFactory.GetContext(false)) {
+        //secMan.Authorize("AccessJobResults", sessionID, jobId); skip authorization
+        return jobManager.GetAllJobResults(jobIds);
       }
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

@@ -165 +165 @@
   </ItemGroup>
   <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

@@ -320 +320 @@
     }
 
-    public ResponseList<JobResult> GetAllJobResults(Guid jobId) {
-      return new ResponseList<JobResult>();
+    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+      ResponseObject<JobResultList> response = new ResponseObject<JobResultList>();
+      JobResultList jobResultList = new JobResultList();
+      IEnumerable<JobDto> jobs = DaoLocator.JobDao.FindJobsById(jobIds);
+      foreach (JobDto job in jobs) {
+        jobResultList.Add(new JobResult() {
+          JobId = job.Id,
+          State = job.State,
+          DateCalculated = job.DateCalculated,
+          DateFinished = job.DateFinished,
+          Exception = job.Exception,
+          Percentage = job.Percentage
+        });        
+      }
+      response.Obj = jobResultList;
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
+      return response;
     }
 

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Server.Core-3.3.csproj.user