Changeset 11036 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers

Timestamp:

06/24/14 16:20:29 (11 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs (modified) (5 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs

@@ -156 +156 @@
            {
              TaskID = tasks.TaskId,
-             TotalWaiting = tasks.TotalWaitingTime,
-             TotalTransfer = tasks.TotalTransferTime,
-             TotalRuntime = tasks.TotalRuntime,
              StartDate = tasks.StartTime
            }).OrderByDescending(s => s.StartDate).ToList().Count;
@@ -170 +167 @@
     }
 
-    public JsonResult GetUserTask(string userName, string limit, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState=null, string currentPage=null)
+    public JsonResult UserTask(string userName, string limit, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState=null)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -193 +190 @@
            }).OrderByDescending(s => s.StartDate).ToList();
 
-        if (currentPage != null) {
-          data.RemoveRange(0, (Convert.ToInt32(currentPage) - 1) * Convert.ToInt32(limit));
-          if (data.Count > Convert.ToInt32(limit)) {
-            data.RemoveRange(Convert.ToInt32(limit), data.Count - Convert.ToInt32(limit));
-          }
-        }
-        else if (data.Count > Convert.ToInt32(limit))
-        {
-          data.RemoveRange(Convert.ToInt32(limit), data.Count - Convert.ToInt32(limit));
-        }
+        List<KeyValuePair<string, List<double>>> results = new List<KeyValuePair<string, List<double>>>();
 
         List<string> id = new List<string>();
@@ -208 +196 @@
         List<double> transfer = new List<double>();
         List<double> run = new List<double>();
+        List<double> times = new List<double>();
         data.ForEach(i => id.Add(i.TaskID.ToString()));
         data.ForEach(w => wait.Add(w.TotalWaiting));
@@ -213 +202 @@
         data.ForEach(r => run.Add(r.TotalRuntime));
 
-        List<List<double>> taskStats = new List<List<double>>();
-        taskStats.Add(wait);
-        taskStats.Add(transfer);
-        taskStats.Add(run);
-
-        return Json(new KeyValuePair<List<string>, List<List<double>>>(id, taskStats), JsonRequestBehavior.AllowGet);
+        for (int i = 0; i < id.Count; i++) {
+          results.Add(new KeyValuePair<string, List<double>>(id[i],new List<double>{wait[i],transfer[i],run[i]}));
+        }
+
+        return Json(results, JsonRequestBehavior.AllowGet);
+      }
+    }
+
+    public JsonResult SlaveInfo(string limit, DateTime? start = null, DateTime? end = null, string userName = null)
+    {
+      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
+      {
+        var data =
+          (from slaves in db.FactClientInfos
+           join users in db.DimUsers
+            on slaves.UserId equals users.UserId
+           where (!start.HasValue || slaves.Time >= start) &&
+           (!end.HasValue || slaves.Time < end) &&
+           (string.IsNullOrEmpty(userName) || users.Name == userName)
+           select new
+           {
+             SlaveID = slaves.ClientId,
+             Time = slaves.Time,
+             UsedCores = slaves.NumUsedCores,
+             TotalCores = slaves.NumTotalCores,
+             UsedMemory = slaves.UsedMemory,
+             TotalMemory = slaves.TotalMemory,
+             CPUUtilization = slaves.CpuUtilization
+           }).OrderByDescending(s => s.Time).GroupBy(s => s.SlaveID).ToList();
+
+        return Json(data, JsonRequestBehavior.AllowGet);
       }
     }