- Timestamp:
- 08/01/14 16:31:09 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs
r11252 r11255 99 99 join clients in db.DimClients 100 100 on client.ClientId equals clients.Id 101 where clients.ExpirationTime == null 101 join resource in db.Resources.OfType<Slave>() 102 on clients.ResourceId equals resource.ResourceId 103 where clients.ExpirationTime == null && 104 (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle) 102 105 select new { client.ClientId, client.CpuUtilization, client.Time }) 103 106 .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList(); … … 117 120 join clients in db.DimClients 118 121 on client.ClientId equals clients.Id 119 where clients.ExpirationTime == null 122 join resource in db.Resources.OfType<Slave>() 123 on clients.ResourceId equals resource.ResourceId 124 where clients.ExpirationTime == null && 125 (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle) 120 126 select new { client.ClientId, client.NumTotalCores, client.NumUsedCores, client.Time }) 121 127 .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList(); … … 136 142 join clients in db.DimClients 137 143 on client.ClientId equals clients.Id 138 where clients.ExpirationTime == null 144 join resource in db.Resources.OfType<Slave>() 145 on clients.ResourceId equals resource.ResourceId 146 where clients.ExpirationTime == null && 147 (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle) 139 148 select new { client.ClientId, client.TotalMemory, client.UsedMemory, client.Time }) 140 149 .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();
Note: See TracChangeset
for help on using the changeset viewer.