Changeset 16332 for branches/2915-AbsoluteSymbol/HeuristicLab.Services.Hive.DataAccess

Timestamp:

11/28/18 22:21:11 (6 years ago)

Author:

gkronber

Message:

#2915: merged r16241:16309 (current HEAD) from HL trunk to branch

Location:

branches/2915-AbsoluteSymbol

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive.DataAccess (modified) (1 prop)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/ProjectDao.cs (modified) (2 diffs)

branches/2915-AbsoluteSymbol/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/ProjectDao.cs

@@ -41 +41 @@
     public void DeleteByIds(IEnumerable<Guid> ids) {
       string paramProjectIds = string.Join(",", ids.ToList().Select(x => string.Format("'{0}'", x)));
-      if(!string.IsNullOrWhiteSpace(paramProjectIds)) {
+      if (!string.IsNullOrWhiteSpace(paramProjectIds)) {
         string queryString = string.Format(DeleteByIdsQueryString, paramProjectIds);
         DataContext.ExecuteCommand(queryString);
@@ -117 +117 @@
       WITH rtree AS
       (
-        SELECT ResourceId, ParentResourceId
-        FROM [Resource]
-        UNION ALL
-        SELECT rt.ResourceId, r.ParentResourceId
-        FROM [Resource] r
-        JOIN rtree rt ON rt.ParentResourceId = r.ResourceId
-      )
-      SELECT apr.ProjectId, SUM(res.Cores) AS Cores, SUM(res.Memory) AS Memory
-      FROM rtree, [AssignedProjectResource] apr, [Resource] res
-      WHERE rtree.ResourceId = res.ResourceId
-      AND res.ResourceType = 'Slave'
-      AND (res.SlaveState = 'Idle' OR SlaveState = 'Calculating')
-      AND rtree.ParentResourceId = apr.ResourceId
-      GROUP BY apr.ProjectId
-      UNION
-      SELECT apr.ProjectId, SUM(res.Cores) AS Cores, SUM(res.Memory) AS Memory
-      FROM [AssignedProjectResource] apr, [Resource] res
-      WHERE apr.ResourceId = res.ResourceId
-      AND res.ResourceType = 'Slave'
-      AND (res.SlaveState = 'Idle' OR SlaveState = 'Calculating')
-      GROUP BY apr.ProjectId
+        SELECT ResourceId, ParentResourceId
+        FROM [Resource]
+        UNION ALL
+        SELECT rt.ResourceId, r.ParentResourceId
+        FROM [Resource] r
+        JOIN rtree rt ON rt.ParentResourceId = r.ResourceId
+      )
+      SELECT [union].ProjectId, SUM([union].Cores), SUM([union].Memory)
+      FROM
+      (
+        SELECT apr.ProjectId, res.Cores, res.Memory
+        FROM rtree, [AssignedProjectResource] apr, [Resource] res
+        WHERE rtree.ResourceId = res.ResourceId
+        AND res.ResourceType = 'Slave'
+        AND (res.SlaveState = 'Idle' OR SlaveState = 'Calculating')
+        AND rtree.ParentResourceId = apr.ResourceId
+        UNION ALL
+        SELECT apr.ProjectId, res.Cores, res.Memory
+        FROM [AssignedProjectResource] apr, [Resource] res
+        WHERE apr.ResourceId = res.ResourceId
+        AND res.ResourceType = 'Slave'
+        AND (res.SlaveState = 'Idle' OR SlaveState = 'Calculating')
+      ) AS [union]
+      GROUP BY [union].ProjectId
     ";