Changeset 5955 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess

Timestamp:

04/05/11 15:37:04 (14 years ago)

Author:

cneumuel

Message:

#1233

• seperated ExperimentMangerClient (OKB-Style, contains business logic) and HiveExperiment (mainly only contains information)
• fixed redundant cloning methods in dtos
• added simple statistics in HiveExperiment which the user can see before downloading an experiment
• added db-delete cascade for slaves and statelogs - now slaves can be safely deleted

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4

Files:

• HiveDao.cs (modified) (2 diffs)
• Tools/prepareHiveDatabase.sql (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs

@@ -232 +232 @@
     public DT.HiveExperiment GetHiveExperiment(Guid id) {
       using (var db = CreateContext()) {
-        return Convert.ToDto(db.HiveExperiments.SingleOrDefault(x => x.HiveExperimentId == id));
-      }
+        return AddStatsToExperiment(db, Convert.ToDto(db.HiveExperiments.SingleOrDefault(x => x.HiveExperimentId == id)));
+      }
+    }
+
+    private DT.HiveExperiment AddStatsToExperiment(HiveDataContext db, DT.HiveExperiment exp) {
+      var jobs = new List<Job>();
+      CollectChildJobs(db, exp.RootJobId, jobs);
+      exp.JobCount = jobs.Count;
+      exp.CalculatingCount = jobs.Count(j => j.State == JobState.Calculating);
+      exp.FinishedCount = jobs.Count(j => j.State == JobState.Finished);
+      return exp;
     }
 
     public IEnumerable<DT.HiveExperiment> GetHiveExperiments(Expression<Func<HiveExperiment, bool>> predicate) {
       using (var db = CreateContext()) {
-        return db.HiveExperiments.Where(predicate).Select(x => Convert.ToDto(x)).ToArray();
+        return db.HiveExperiments.Where(predicate).Select(x => AddStatsToExperiment(db, Convert.ToDto(x))).ToArray();
       }
     }
@@ -640 +649 @@
     }
     #endregion
+
+    #region Helpers
+    private void CollectChildJobs(HiveDataContext db, Guid parentJobId, List<Job> collection) {
+      var jobs = db.Jobs.Where(j => j.ParentJobId == parentJobId);
+      foreach (var job in jobs) {
+        collection.Add(job);
+        if (job.IsParentJob)
+          CollectChildJobs(db, job.JobId, collection);
+      }
+    }
+    #endregion
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Tools/prepareHiveDatabase.sql

@@ -47 +47 @@
 ON UPDATE CASCADE
 ON DELETE CASCADE
+GO
+ALTER TABLE [dbo].[StateLog]  DROP  CONSTRAINT [Resource_StateLog]
+ALTER TABLE [dbo].[StateLog]  WITH CHECK ADD CONSTRAINT [Resource_StateLog] FOREIGN KEY([SlaveId])
+REFERENCES [dbo].[Resource] ([ResourceId])
+ON UPDATE CASCADE
+ON DELETE SET NULL
 GO