Changeset 12563 for stable/HeuristicLab.Services.Hive

Timestamp:

07/01/15 14:59:47 (9 years ago)

Author:

ascheibe

Message:

#2394 merged r12428, r12429, r12430, r12435, r12442, r12443, r12445, r12514, r12517, r12519, r12520, r12521, r12523, r12532, r12542, r12546, r12552, r12553, r12556, r12557, r12559, r12561, r12146, r12457 into stable

Location:

stable

Files:

• . (modified) (2 props)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Interfaces/IOptimizedHiveDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/OptimizedHiveDao.cs (modified) (1 diff)

stable/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -869 +869 @@
     }
 
-    public Dictionary<Guid, int> GetWaitingTasksByUser() {
-      using (var db = CreateContext()) {
-        var waitingTasksByUser = from task in db.Tasks
-                                 where task.State == TaskState.Waiting
-                                 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> GetWaitingTasksByUserForResources(List<Guid> resourceIds) {
       using (var db = CreateContext()) {
@@ -886 +876 @@
                                  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);
       }
     }

stable/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs

@@ -150 +150 @@
 
     #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);

stable/HeuristicLab.Services.Hive/3.3/Interfaces/IOptimizedHiveDao.cs

@@ -65 +65 @@
     IEnumerable<Guid> GetAssignedResourceIds(Guid jobId);
     #endregion
+
+    #region Website Methods
+
+    IEnumerable<Guid> GetAllResourceIds();
+
+    int GetNumberOfWaitingTasks();
+
+    Dictionary<Guid, int> GetCalculatingTasksByUser();
+
+    Dictionary<Guid, int> GetWaitingTasksByUser();
+
+    #endregion
   }
 }

stable/HeuristicLab.Services.Hive/3.3/OptimizedHiveDao.cs

@@ -245 +245 @@
     );
     #endregion
+
+
+    #region Website Methods
+    private const string GetAllResourceIdsString = @"SELECT ResourceId FROM [Resource]";
+    public IEnumerable<Guid> GetAllResourceIds() {
+      return Db.ExecuteQuery<Guid>(GetAllResourceIdsString);
+    }
+
+    private const string GetNumberOfWaitingTasksString = @"SELECT COUNT(TaskId) 
+                                                           FROM [Task] 
+                                                           WHERE TaskState LIKE 'Waiting'";
+    public int GetNumberOfWaitingTasks() {
+      return Db.ExecuteQuery<int>(GetNumberOfWaitingTasksString).Single();
+    }
+
+    private class UserTasks {
+      public Guid OwnerUserId;
+      public int Count;
+    }
+
+    private const string GetCalculatingTasksByUserString = @"SELECT Job.OwnerUserId, COUNT(Task.TaskId) as Count 
+                                                             FROM Task, Job 
+                                                             WHERE TaskState LIKE 'Calculating' AND Task.JobId = Job.JobId
+                                                             GROUP BY Job.OwnerUserId";
+
+    public Dictionary<Guid, int> GetCalculatingTasksByUser() {
+      var result = Db.ExecuteQuery<UserTasks>(GetCalculatingTasksByUserString);
+      Dictionary<Guid, int> lst = new Dictionary<Guid, int>();
+
+      foreach (var userTask in result) {
+        lst.Add(userTask.OwnerUserId, userTask.Count);
+      }
+      return lst;
+    }
+
+    private const string GetWaitingTasksByUserString = @"SELECT Job.OwnerUserId, COUNT(Task.TaskId) as Count 
+                                                         FROM Task, Job 
+                                                         WHERE TaskState LIKE 'Waiting' AND Task.JobId = Job.JobId
+                                                         GROUP BY Job.OwnerUserId";
+
+    public Dictionary<Guid, int> GetWaitingTasksByUser() {
+      var result = Db.ExecuteQuery<UserTasks>(GetWaitingTasksByUserString);
+      Dictionary<Guid, int> lst = new Dictionary<Guid, int>();
+
+      foreach (var userTask in result) {
+        lst.Add(userTask.OwnerUserId, userTask.Count);
+      }
+      return lst;
+    }
+    #endregion
   }
 }