Changeset 9635 for branches

Timestamp:

06/17/13 11:51:20 (11 years ago)

Author:

pfleck

Message:

#2030:
Restructured and simplified GetTaskByIdAndLastStateLogSlaveIdQuery.
Sorted StateLogs in GetLightweightTasksQuery.

File:

• branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/OptimizedHiveDao.cs (modified) (2 diffs)

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/OptimizedHiveDao.cs

@@ -56 +56 @@
 
     private static readonly Func<HiveDataContext, Guid, IQueryable<Tuple<Task, Guid?>>> GetTaskByIdAndLastStateLogSlaveIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid taskId) =>
-       from t in db.Tasks
-       join sl in db.StateLogs on t.TaskId equals sl.TaskId
-       where t.TaskId == taskId
-       orderby sl.DateTime descending
-       group sl by t into logs
-       select new Tuple<Task, Guid?>(logs.Key, logs.First().SlaveId)
+      from t in db.Tasks
+      let lastStateLog = t.StateLogs.OrderByDescending(sl => sl.DateTime).FirstOrDefault()
+      where t.TaskId == taskId
+      select new Tuple<Task, Guid?>(t, lastStateLog != null ? lastStateLog.SlaveId : null)
     );
 
@@ -100 +98 @@
           ExecutionTime = TimeSpan.FromMilliseconds(task.ExecutionTimeMs),
           ParentTaskId = task.ParentTaskId,
-          StateLog = task.StateLogs.Select(sl => ConvertStateLog(sl)).ToList(),
+          StateLog = task.StateLogs.OrderBy(sl => sl.DateTime).Select(sl => ConvertStateLog(sl)).ToList(),
           State = ConvertTaskState(task.State),
           Command = ConvertCommand(task.Command),