Changeset 12467 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi

Timestamp:

06/18/15 11:56:31 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs (modified) (4 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Linq;
 using System.Linq;
 using System.Web.Http;
@@ -42 +43 @@
         SELECT 
           DISTINCT UserId,
-          (SELECT Count FROM UserTasks WHERE TaskState = 'Calculating' AND UserId = ut.UserId) AS CalculatingTasks,
-          (SELECT Count FROM UserTasks WHERE TaskState = 'Waiting' AND UserId = ut.UserId) AS WaitingTasks
+          ISNULL((SELECT Count FROM UserTasks WHERE TaskState = 'Calculating' AND UserId = ut.UserId), 0) AS CalculatingTasks,
+          ISNULL((SELECT Count FROM UserTasks WHERE TaskState = 'Waiting' AND UserId = ut.UserId), 0) AS WaitingTasks
         FROM UserTasks ut;";
-
 
     private class UserTaskStatus {
@@ -73 +73 @@
         var activeSlaves = onlineSlaves.Where(s => s.IsAllowedToCalculate).ToList();
         var calculatingSlaves = activeSlaves.Where(s => s.SlaveState == SlaveState.Calculating).ToList();
-
         int calculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.Memory) / 1024 : 0;
         int freeCalculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.FreeMemory) / 1024 : 0;
@@ -129 +128 @@
       }
       using (var db = new HiveDataContext()) {
-        var statistics = db.Statistics.Where(s => s.Timestamp >= start && s.Timestamp <= end);
+        DataLoadOptions loadOptions = new DataLoadOptions();
+        loadOptions.LoadWith<Statistics>(o => o.SlaveStatistics);
+        db.LoadOptions = loadOptions;
+        db.DeferredLoadingEnabled = false;
+        var statistics = db.Statistics.Where(s => s.Timestamp >= start && s.Timestamp <= end)
+                                      .OrderBy(s => s.Timestamp)
+                                      .ToList();
         var status = new DTO.Status {
           CoreStatus = new DTO.CoreStatus(),