Changeset 9033 for trunk/sources/HeuristicLab.Services.Hive

Timestamp:

12/12/12 11:04:23 (11 years ago)

Author:

ascheibe

Message:

#1994 Calculating/Waiting Tasks are now calculated for the selected resource

Location:

trunk/sources/HeuristicLab.Services.Hive/3.3

Files:

• HiveDao.cs (modified) (1 diff)
• Interfaces/IHiveDao.cs (modified) (1 diff)

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

@@ -843 +843 @@
     }
 
+    public Dictionary<Guid, int> GetWaitingTasksByUserForResources(List<Guid> resourceIds) {
+      using (var db = CreateContext()) {
+        var waitingTasksByUser = from task in db.Tasks
+                                 where task.State == TaskState.Waiting && task.AssignedResources.Any(x => resourceIds.Contains(x.ResourceId))
+                                 group task by task.Job.OwnerUserId into g
+                                 select new { UserId = g.Key, UsedCores = g.Count() };
+        return waitingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
+    }
+
     public Dictionary<Guid, int> GetCalculatingTasksByUser() {
       using (var db = CreateContext()) {
         var calculatingTasksByUser = from task in db.Tasks
                                      where task.State == TaskState.Calculating
+                                     group task by task.Job.OwnerUserId into g
+                                     select new { UserId = g.Key, UsedCores = g.Count() };
+        return calculatingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
+    }
+
+    public Dictionary<Guid, int> GetCalculatingTasksByUserForResources(List<Guid> resourceIds) {
+      using (var db = CreateContext()) {
+        var calculatingTasksByUser = from task in db.Tasks
+                                     where task.State == TaskState.Calculating && task.AssignedResources.Any(x => resourceIds.Contains(x.ResourceId))
                                      group task by task.Job.OwnerUserId into g
                                      select new { UserId = g.Key, UsedCores = g.Count() };

trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs

@@ -148 +148 @@
     #region Statistics Methods
     Dictionary<Guid, int> GetWaitingTasksByUser();
+    Dictionary<Guid, int> GetWaitingTasksByUserForResources(List<Guid> resourceIds);
     Dictionary<Guid, int> GetCalculatingTasksByUser();
+    Dictionary<Guid, int> GetCalculatingTasksByUserForResources(List<Guid> resourceIds);
     DT.Statistics GetStatistic(Guid id);
     IEnumerable<DT.Statistics> GetStatistics(Expression<Func<Statistics, bool>> predicate);