Changeset 3011 for trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs

Timestamp:

03/12/10 10:57:21 (15 years ago)

Author:

kgrading

Message:

changed the complete DAL to LINQ 2 SQL (with the exception of the job streaming), did a lot of refactoring, Introduced DTOs (that are named DTOs for better understanding), added the spring.NET Interceptor, reintroduced transactions and cleaned up the whole JobResult thing and updated a part of the config merger (#830)

File:

• trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs

@@ -101 +101 @@
 
       for (int i = 0; i < loops; i++) {
-        ResponseObject<Contracts.BusinessObjects.Job> res = executionEngineFacade.AddJob(jobObj);
+        ResponseObject<Contracts.BusinessObjects.JobDto> res = executionEngineFacade.AddJob(jobObj);
         jobId = res.Obj.Id;
       }
@@ -112 +112 @@
       Thread t = new Thread(() => {
         IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
-        ResponseObject<SerializedJobResult> response = null;
+        ResponseObject<SerializedJob> response = null;
         Job restoredJob = null;
         do {
@@ -128 +128 @@
             if (response.Success && response.Obj != null) {
               HiveLogger.Debug("HiveEngine: Results-polling - Got result!");
-              restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobResultData);
+              restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
               HiveLogger.Debug("HiveEngine: Results-polling - IsSnapshotResult: " + (restoredJob.Progress<1.0));
             }
@@ -146 +146 @@
       IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
       int retryCount = 0;
-      ResponseObject<SerializedJobResult> response;
+      ResponseObject<SerializedJob> response;
       lock (locker) {
         HiveLogger.Debug("HiveEngine: Abort - RequestSnapshot");
@@ -174 +174 @@
         }
       }
-      SerializedJobResult jobResult = response.Obj;
+      SerializedJob jobResult = response.Obj;
       if (jobResult != null) {
         HiveLogger.Debug("HiveEngine: Results-polling - Got result!");
-        job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobResultData);
+        job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobData);
         ControlManager.Manager.ShowControl(job.Engine.CreateView());
       }
@@ -210 +210 @@
 
     private HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob CreateJobObj() {
-      HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj =
-        new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
+      HeuristicLab.Hive.Contracts.BusinessObjects.JobDto jobObj =
+        new HeuristicLab.Hive.Contracts.BusinessObjects.JobDto();
 
       MemoryStream memStream = new MemoryStream();
@@ -240 +240 @@
       }
 
-      List<HivePluginInfo> pluginsNeeded =
-        new List<HivePluginInfo>();
+      List<HivePluginInfoDto> pluginsNeeded =
+        new List<HivePluginInfoDto>();
       foreach (IPluginDescription uniquePlugin in plugins) {
-        HivePluginInfo pluginInfo =
-          new HivePluginInfo();
+        HivePluginInfoDto pluginInfo =
+          new HivePluginInfoDto();
         pluginInfo.Name = uniquePlugin.Name;
         pluginInfo.Version = uniquePlugin.Version.ToString();