Changeset 9123 for trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

01/07/13 22:00:04 (11 years ago)

Author:

ascheibe

Message:

#1712 reintegrated Hive Scheduler branch and made further performance improvements

Location:

trunk/sources/HeuristicLab.Services.Hive

Files:

• . (modified) (1 prop)
• 3.3/HiveService.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -142 +142 @@
       author.AuthorizeForTask(taskDto.Id, Permission.Full);
       trans.UseTransaction(() => {
-        dao.UpdateTask(taskDto);
+        dao.UpdateTaskAndPlugins(taskDto);
       });
     }
@@ -152 +152 @@
       //trans.UseTransaction(() => { // cneumuel: try without transaction
       taskData.LastUpdate = DateTime.Now;
-      dao.UpdateTask(task);
+      dao.UpdateTaskAndPlugins(task);
       dao.UpdateTaskData(taskData);
       //}, false, true);
@@ -194 +194 @@
         }
 
-        dao.UpdateTask(task);
+        dao.UpdateTaskAndPlugins(task);
         return task;
       });
@@ -499 +499 @@
     #endregion
 
+    #region Resource Methods
+    public IEnumerable<Resource> GetChildResources(Guid resourceId) {
+      return dao.GetChildResources(resourceId);
+    }
+    #endregion
+
     #region Slave Methods
     public int GetNewHeartbeatInterval(Guid slaveId) {
@@ -671 +677 @@
     #endregion
 
+    #region UserPriority Methods
+    public IEnumerable<UserPriority> GetUserPriorities() {
+      return trans.UseTransaction(() => dao.GetUserPriorities(x => true));
+    }
+    #endregion
+
     #region Helper Methods
     private IEnumerable<Task> GetChildTasks(Guid? parentTaskId, bool recursive, bool includeParent) {
@@ -687 +699 @@
     }
     #endregion
+
+    #region Statistics Methods
+    public IEnumerable<Statistics> GetStatistics() {
+      return dao.GetStatistics(x => true);
+    }
+    public IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to) {
+      return dao.GetStatistics(x => x.Timestamp >= from && x.Timestamp <= to);
+    }
+    #endregion
   }
 }