Changeset 9202 for branches/UnloadJobs/HeuristicLab.Services.Hive

Timestamp:

02/03/13 16:17:44 (11 years ago)

Author:

ascheibe

Message:

#2005

• add repeating of failed tasks and task datas
• added an additional ws method that loads lightweight tasks without the statelogs

Location:

branches/UnloadJobs/HeuristicLab.Services.Hive/3.3

Files:

• HiveDao.cs (modified) (1 diff)
• HiveService.cs (modified) (1 diff)
• Interfaces/IHiveDao.cs (modified) (1 diff)
• ServiceContracts/IHiveService.cs (modified) (1 diff)

branches/UnloadJobs/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -71 +71 @@
     }
 
+    public IEnumerable<DT.LightweightTask> GetLightweightTasksWithoutStateLog(Expression<Func<Task, bool>> predicate) {
+      List<DT.LightweightTask> tasks = new List<DT.LightweightTask>();
+
+      using (var db = CreateContext()) {
+        var tasksQuery = db.Tasks.Where(predicate).Select(task => new { task.TaskId, task.ExecutionTimeMs, task.ParentTaskId, task.State, task.Command });
+        var taskDatasQuery = db.Tasks.Where(predicate).Where(task => task.JobData != null).Select(task => new { task.TaskId, task.JobData.LastUpdate });
+
+        foreach (var task in tasksQuery) {
+          DT.LightweightTask t = new DT.LightweightTask();
+          t.Id = task.TaskId;
+          t.ExecutionTime = TimeSpan.FromMilliseconds(task.ExecutionTimeMs);
+          t.ParentTaskId = task.ParentTaskId;
+          t.StateLog = new List<DT.StateLog>();
+          t.State = DataTransfer.Convert.ToDto(task.State);
+          t.Command = DataTransfer.Convert.ToDto(task.Command);
+          t.LastTaskDataUpdate = taskDatasQuery.Where(x => x.TaskId == task.TaskId).Count() > 0 ? taskDatasQuery.Select(x => x.LastUpdate).First() : DateTime.MinValue;
+          tasks.Add(t);
+        }
+      }
+      return tasks;
+    }
+
     public Guid AddTask(DT.Task dto) {
       using (var db = CreateContext()) {

branches/UnloadJobs/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -129 +129 @@
       return trans.UseTransaction(() => {
         return dao.GetLightweightTasks(task => task.JobId == jobId).ToArray();
+      }, false, true);
+    }
+
+    public IEnumerable<LightweightTask> GetLightweightJobTasksWithoutStateLog(Guid jobId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      author.AuthorizeForJob(jobId, Permission.Read);
+
+      return trans.UseTransaction(() => {
+        return dao.GetLightweightTasksWithoutStateLog(task => task.JobId == jobId).ToArray();
       }, false, false);
     }

branches/UnloadJobs/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs

@@ -32 +32 @@
     IEnumerable<DT.Task> GetTasks(Expression<Func<Task, bool>> predicate);
     IEnumerable<DT.LightweightTask> GetLightweightTasks(Expression<Func<Task, bool>> predicate);
+    IEnumerable<DT.LightweightTask> GetLightweightTasksWithoutStateLog(Expression<Func<Task, bool>> predicate);
     Guid AddTask(DT.Task dto);
     void UpdateTaskAndPlugins(DT.Task dto);

branches/UnloadJobs/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -53 +53 @@
 
     [OperationContract]
+    IEnumerable<LightweightTask> GetLightweightJobTasksWithoutStateLog(Guid jobId);
+
+    [OperationContract]
     TaskData GetTaskData(Guid taskId);