Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3

Timestamp:

09/08/11 13:41:25 (13 years ago)

Author:

ascheibe

Message:

#1233 Review comments: renamed Job to Task

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3

Files:

• Convert.cs (modified) (8 diffs)
• DataTransfer/LightweightTask.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/LightweightJob.cs) (2 diffs)
• DataTransfer/StateLog.cs (modified) (1 diff)
• DataTransfer/Task.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Job.cs) (2 diffs)
• DataTransfer/TaskData.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/JobData.cs) (2 diffs)
• DataTransfer/TaskState.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/JobState.cs) (3 diffs)
• HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HiveDao.cs (modified) (18 diffs)
• HiveService.cs (modified) (14 diffs)
• Interfaces/IHiveDao.cs (modified) (2 diffs)
• Manager/EventManager.cs (modified) (3 diffs)
• Manager/HeartbeatManager.cs (modified) (3 diffs)
• MessageContainer.cs (modified) (3 diffs)
• ServiceContracts/IHiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Convert.cs

@@ -31 +31 @@
   public static class Convert {
     #region Job
-    public static DT.Job ToDto(DB.Job source) {
-      if (source == null) return null;
-      return new DT.Job {
-        Id = source.JobId,
+    public static DT.Task ToDto(DB.Task source) {
+      if (source == null) return null;
+      return new DT.Task {
+        Id = source.TaskId,
         CoresNeeded = source.CoresNeeded,
         ExecutionTime = TimeSpan.FromMilliseconds(source.ExecutionTimeMs),
         MemoryNeeded = source.MemoryNeeded,
-        ParentJobId = source.ParentJobId,
+        ParentTaskId = source.ParentTaskId,
         Priority = source.Priority,
         PluginsNeededIds = (source.RequiredPlugins == null ? new List<Guid>() : source.RequiredPlugins.Select(x => x.PluginId).ToList()),
@@ -44 +44 @@
         State = Convert.ToDto(source.State),
         StateLog = (source.StateLogs == null ? new List<DT.StateLog>() : source.StateLogs.Select(x => Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList()),
-        IsParentJob = source.IsParentJob,
+        IsParentJob = source.IsParentTask,
         FinishWhenChildJobsFinished = source.FinishWhenChildJobsFinished,
         Command = Convert.ToDto(source.Command),
@@ -53 +53 @@
     }
 
-    public static DB.Job ToEntity(DT.Job source) {
-      if (source == null) return null;
-      var entity = new DB.Job(); ToEntity(source, entity);
-      return entity;
-    }
-    public static void ToEntity(DT.Job source, DB.Job target) {
-      if ((source != null) && (target != null)) {
-        target.JobId = source.Id;
+    public static DB.Task ToEntity(DT.Task source) {
+      if (source == null) return null;
+      var entity = new DB.Task(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.Task source, DB.Task target) {
+      if ((source != null) && (target != null)) {
+        target.TaskId = source.Id;
         target.CoresNeeded = source.CoresNeeded;
         target.ExecutionTimeMs = source.ExecutionTime.TotalMilliseconds;
         target.MemoryNeeded = source.MemoryNeeded;
-        target.ParentJobId = source.ParentJobId;
+        target.ParentTaskId = source.ParentTaskId;
         target.Priority = source.Priority;
         target.LastHeartbeat = source.LastHeartbeat;
@@ -72 +72 @@
           target.StateLogs.Add(Convert.ToEntity(sl));
         }
-        target.IsParentJob = source.IsParentJob;
+        target.IsParentTask = source.IsParentJob;
         target.FinishWhenChildJobsFinished = source.FinishWhenChildJobsFinished;
         target.Command = Convert.ToEntity(source.Command);
@@ -83 +83 @@
 
     #region JobData
-    public static DT.JobData ToDto(DB.JobData source) {
-      if (source == null) return null;
-      return new DT.JobData { JobId = source.JobId, Data = source.Data.ToArray(), LastUpdate = source.LastUpdate };
-    }
-    public static DB.JobData ToEntity(DT.JobData source) {
-      if (source == null) return null;
-      var entity = new DB.JobData(); ToEntity(source, entity);
-      return entity;
-    }
-    public static void ToEntity(DT.JobData source, DB.JobData target) {
-      if ((source != null) && (target != null)) {
-        target.JobId = source.JobId; target.Data = new Binary(source.Data); target.LastUpdate = source.LastUpdate;
+    public static DT.TaskData ToDto(DB.TaskData source) {
+      if (source == null) return null;
+      return new DT.TaskData { TaskId = source.TaskId, Data = source.Data.ToArray(), LastUpdate = source.LastUpdate };
+    }
+    public static DB.TaskData ToEntity(DT.TaskData source) {
+      if (source == null) return null;
+      var entity = new DB.TaskData(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.TaskData source, DB.TaskData target) {
+      if ((source != null) && (target != null)) {
+        target.TaskId = source.TaskId; target.Data = new Binary(source.Data); target.LastUpdate = source.LastUpdate;
       }
     }
@@ -102 +102 @@
     public static DT.StateLog ToDto(DB.StateLog source) {
       if (source == null) return null;
-      return new DT.StateLog { Id = source.StateLogId, DateTime = source.DateTime, Exception = source.Exception, JobId = source.JobId, SlaveId = source.SlaveId, State = Convert.ToDto(source.State), UserId = source.UserId };
+      return new DT.StateLog { Id = source.StateLogId, DateTime = source.DateTime, Exception = source.Exception, TaskId = source.TaskId, SlaveId = source.SlaveId, State = Convert.ToDto(source.State), UserId = source.UserId };
     }
     public static DB.StateLog ToEntity(DT.StateLog source) {
@@ -111 +111 @@
     public static void ToEntity(DT.StateLog source, DB.StateLog target) {
       if ((source != null) && (target != null)) {
-        target.StateLogId = source.Id; target.DateTime = source.DateTime; target.Exception = source.Exception; target.JobId = source.JobId; target.SlaveId = source.SlaveId; target.State = Convert.ToEntity(source.State); target.UserId = source.UserId;
+        target.StateLogId = source.Id; target.DateTime = source.DateTime; target.Exception = source.Exception; target.TaskId = source.TaskId; target.SlaveId = source.SlaveId; target.State = Convert.ToEntity(source.State); target.UserId = source.UserId;
       }
     }
@@ -365 +365 @@
 
 
-    #region JobState
-    public static DT.JobState ToDto(DB.JobState source) {
-      if (source == DB.JobState.Aborted) {
-        return JobState.Aborted;
-      } else if (source == DB.JobState.Calculating) {
-        return JobState.Calculating;
-      } else if (source == DB.JobState.Failed) {
-        return JobState.Failed;
-      } else if (source == DB.JobState.Finished) {
-        return JobState.Finished;
-      } else if (source == DB.JobState.Offline) {
-        return JobState.Offline;
-      } else if (source == DB.JobState.Paused) {
-        return JobState.Paused;
-      } else if (source == DB.JobState.Transferring) {
-        return JobState.Transferring;
-      } else if (source == DB.JobState.Waiting) {
-        return JobState.Waiting;
-      } else
-        return JobState.Failed;
-    }
-
-    public static DB.JobState ToEntity(DT.JobState source) {
-      if (source == DT.JobState.Aborted) {
-        return DB.JobState.Aborted;
-      } else if (source == DT.JobState.Calculating) {
-        return DB.JobState.Calculating;
-      } else if (source == DT.JobState.Failed) {
-        return DB.JobState.Failed;
-      } else if (source == DT.JobState.Finished) {
-        return DB.JobState.Finished;
-      } else if (source == DT.JobState.Offline) {
-        return DB.JobState.Offline;
-      } else if (source == DT.JobState.Paused) {
-        return DB.JobState.Paused;
-      } else if (source == DT.JobState.Transferring) {
-        return DB.JobState.Transferring;
-      } else if (source == DT.JobState.Waiting) {
-        return DB.JobState.Waiting;
-      } else
-        return DB.JobState.Failed;
+    #region TaskData
+    public static DT.TaskState ToDto(DB.TaskState source) {
+      if (source == DB.TaskState.Aborted) {
+        return TaskState.Aborted;
+      } else if (source == DB.TaskState.Calculating) {
+        return TaskState.Calculating;
+      } else if (source == DB.TaskState.Failed) {
+        return TaskState.Failed;
+      } else if (source == DB.TaskState.Finished) {
+        return TaskState.Finished;
+      } else if (source == DB.TaskState.Offline) {
+        return TaskState.Offline;
+      } else if (source == DB.TaskState.Paused) {
+        return TaskState.Paused;
+      } else if (source == DB.TaskState.Transferring) {
+        return TaskState.Transferring;
+      } else if (source == DB.TaskState.Waiting) {
+        return TaskState.Waiting;
+      } else
+        return TaskState.Failed;
+    }
+
+    public static DB.TaskState ToEntity(DT.TaskState source) {
+      if (source == DT.TaskState.Aborted) {
+        return DB.TaskState.Aborted;
+      } else if (source == DT.TaskState.Calculating) {
+        return DB.TaskState.Calculating;
+      } else if (source == DT.TaskState.Failed) {
+        return DB.TaskState.Failed;
+      } else if (source == DT.TaskState.Finished) {
+        return DB.TaskState.Finished;
+      } else if (source == DT.TaskState.Offline) {
+        return DB.TaskState.Offline;
+      } else if (source == DT.TaskState.Paused) {
+        return DB.TaskState.Paused;
+      } else if (source == DT.TaskState.Transferring) {
+        return DB.TaskState.Transferring;
+      } else if (source == DT.TaskState.Waiting) {
+        return DB.TaskState.Waiting;
+      } else
+        return DB.TaskState.Failed;
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/LightweightTask.cs

@@ -28 +28 @@
   [DataContract]
   [Serializable]
-  public class LightweightJob : HiveItem {
+  public class LightweightTask : HiveItem {
     [DataMember]
     public TimeSpan ExecutionTime { get; set; }
     [DataMember]
-    public Guid? ParentJobId { get; set; }
+    public Guid? ParentTaskId { get; set; }
     [DataMember]
     public List<StateLog> StateLog { get; set; }
     [DataMember]
-    public JobState State { get; set; }
+    public TaskState State { get; set; }
     [DataMember]
     public Command? Command { get; set; }
@@ -44 +44 @@
     public StateLog CurrentStateLog { get { return StateLog.LastOrDefault(); } }
     public DateTime? DateCreated { get { return StateLog.Count > 0 ? new DateTime?(StateLog.First().DateTime) : null; } }
-    public DateTime? DateFinished { get { return (StateLog.Count > 0 && CurrentStateLog.State == JobState.Finished) ? new DateTime?(CurrentStateLog.DateTime) : null; } }
+    public DateTime? DateFinished { get { return (StateLog.Count > 0 && CurrentStateLog.State == TaskState.Finished) ? new DateTime?(CurrentStateLog.DateTime) : null; } }
 
-    public LightweightJob() {
+    public LightweightTask() {
       StateLog = new List<DataTransfer.StateLog>();
     }
 
-    public LightweightJob(Job job) {
+    public LightweightTask(Task job) {
       this.Id = job.Id;
       this.ExecutionTime = job.ExecutionTime;
-      this.ParentJobId = job.ParentJobId;
+      this.ParentTaskId = job.ParentTaskId;
       this.StateLog = new List<StateLog>(job.StateLog);
       this.State = job.State;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/StateLog.cs

@@ -36 +36 @@
     public string Exception { get; set; }
     [DataMember]
-    public JobState State { get; set; }
+    public TaskState State { get; set; }
     [DataMember]
-    public Guid JobId { get; set; }
+    public Guid TaskId { get; set; }
 
     public StateLog() { }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Task.cs

@@ -27 +27 @@
   [DataContract]
   [Serializable]
-  public class Job : LightweightJob {
+  public class Task : LightweightTask {
     [DataMember]
     public int Priority { get; set; }
@@ -47 +47 @@
     public bool IsPrivileged { get; set; }
 
-    public Job() {
+    public Task() {
       this.PluginsNeededIds = new List<Guid>();
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/TaskData.cs

@@ -26 +26 @@
   [DataContract]
   [Serializable]
-  public class JobData {
+  public class TaskData {
     [DataMember]
-    public Guid JobId { get; set; }
+    public Guid TaskId { get; set; }
     [DataMember]
     public byte[] Data { get; set; }
@@ -34 +34 @@
     public DateTime LastUpdate { get; set; }
 
-    public JobData() { }
+    public TaskData() { }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/TaskState.cs

@@ -24 +24 @@
 namespace HeuristicLab.Services.Hive.DataTransfer {
   [Serializable]
-  public enum JobState {
+  public enum TaskState {
     /// <summary>
-    /// A job is offline as long as he is not yet submitted to the hive
+    /// A task is offline as long as he is not yet submitted to the hive
     /// </summary>
     Offline,
 
     /// <summary>
-    /// Job is waiting to be calculated
+    /// Task is waiting to be calculated
     /// </summary>
     Waiting,
 
     /// <summary>
-    /// Job is beeing transferred
+    /// Task is beeing transferred
     /// </summary>
     Transferring,
 
     /// <summary>
-    /// Job is actively calculated on a Slave
+    /// Task is actively calculated on a Slave
     /// </summary>
     Calculating,
 
     /// <summary>
-    /// Job is paused, will not be picked up by slaves
+    /// Task is paused, will not be picked up by slaves
     /// </summary>
     Paused,
 
     /// <summary>
-    /// Job as finished and is ready to be collected by the Client
+    /// Task as finished and is ready to be collected by the Client
     /// </summary>
     Finished,
 
     /// <summary>
-    /// Job is aborted and result can be collected by the Client
+    /// Task is aborted and result can be collected by the Client
     /// </summary>
     Aborted,
 
     /// <summary>
-    /// Job as been aborted due to an error. Results are ready to be collected
+    /// Task as been aborted due to an error. Results are ready to be collected
     /// </summary>
     Failed
   };
 
-  public static class JobStateExtensions {
+  public static class TaskStateExtensions {
     /// <summary>
     /// This job is not yet done
     /// </summary>
-    public static bool IsActive(this JobState jobState) {
-      return !jobState.IsDone();
+    public static bool IsActive(this TaskState taskState) {
+      return !taskState.IsDone();
     }
 
@@ -77 +77 @@
     /// This job is Waiting
     /// </summary>
-    public static bool IsWaiting(this JobState jobState) {
-      return jobState == JobState.Waiting;
+    public static bool IsWaiting(this TaskState taskState) {
+      return taskState == TaskState.Waiting;
     }
 
@@ -84 +84 @@
     /// This job is Finished || Failed || Aborted
     /// </summary>
-    public static bool IsDone(this JobState jobState) {
-      return jobState == JobState.Finished ||
-        jobState == JobState.Aborted ||
-        jobState == JobState.Failed;
+    public static bool IsDone(this TaskState taskState) {
+      return taskState == TaskState.Finished ||
+        taskState == TaskState.Aborted ||
+        taskState == TaskState.Failed;
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -111 +111 @@
     <Compile Include="DataTransfer\HiveExperimentPermission.cs" />
     <Compile Include="DataTransfer\HiveItem.cs" />
-    <Compile Include="DataTransfer\Job.cs" />
-    <Compile Include="DataTransfer\JobData.cs" />
-    <Compile Include="DataTransfer\JobState.cs" />
-    <Compile Include="DataTransfer\LightweightJob.cs" />
+    <Compile Include="DataTransfer\Task.cs" />
+    <Compile Include="DataTransfer\TaskData.cs" />
+    <Compile Include="DataTransfer\TaskState.cs" />
+    <Compile Include="DataTransfer\LightweightTask.cs" />
     <Compile Include="DataTransfer\NamedHiveItem.cs" />
     <Compile Include="DataTransfer\Permission.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -37 +37 @@
 
     #region Job Methods
-    public DT.Job GetJob(Guid id) {
-      using (var db = CreateContext()) {
-        return DT.Convert.ToDto(db.Jobs.SingleOrDefault(x => x.JobId == id));
-      }
-    }
-
-    public IEnumerable<DT.Job> GetJobs(Expression<Func<Job, bool>> predicate) {
-      using (var db = CreateContext()) {
-        return db.Jobs.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();
-      }
-    }
-
-    public Guid AddJob(DT.Job dto) {
-      using (var db = CreateContext()) {
-        var entity = DT.Convert.ToEntity(dto);
-        db.Jobs.InsertOnSubmit(entity);
+    public DT.Task GetJob(Guid id) {
+      using (var db = CreateContext()) {
+        return DT.Convert.ToDto(db.Tasks.SingleOrDefault(x => x.TaskId == id));
+      }
+    }
+
+    public IEnumerable<DT.Task> GetJobs(Expression<Func<Task, bool>> predicate) {
+      using (var db = CreateContext()) {
+        return db.Tasks.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();
+      }
+    }
+
+    public Guid AddJob(DT.Task dto) {
+      using (var db = CreateContext()) {
+        var entity = DT.Convert.ToEntity(dto);
+        db.Tasks.InsertOnSubmit(entity);
         db.SubmitChanges();
         foreach (Guid pluginId in dto.PluginsNeededIds) {
-          db.RequiredPlugins.InsertOnSubmit(new RequiredPlugin() { JobId = entity.JobId, PluginId = pluginId });
-        }
-        db.SubmitChanges();
-        return entity.JobId;
-      }
-    }
-
-    public void UpdateJob(DT.Job dto) {
-      using (var db = CreateContext()) {
-        var entity = db.Jobs.FirstOrDefault(x => x.JobId == dto.Id);
-        if (entity == null) db.Jobs.InsertOnSubmit(DT.Convert.ToEntity(dto));
+          db.RequiredPlugins.InsertOnSubmit(new RequiredPlugin() { TaskId = entity.TaskId, PluginId = pluginId });
+        }
+        db.SubmitChanges();
+        return entity.TaskId;
+      }
+    }
+
+    public void UpdateJob(DT.Task dto) {
+      using (var db = CreateContext()) {
+        var entity = db.Tasks.FirstOrDefault(x => x.TaskId == dto.Id);
+        if (entity == null) db.Tasks.InsertOnSubmit(DT.Convert.ToEntity(dto));
         else DT.Convert.ToEntity(dto, entity);
         foreach (Guid pluginId in dto.PluginsNeededIds) {
           if (db.RequiredPlugins.Count(p => p.PluginId == pluginId) == 0) {
-            db.RequiredPlugins.InsertOnSubmit(new RequiredPlugin() { JobId = entity.JobId, PluginId = pluginId });
+            db.RequiredPlugins.InsertOnSubmit(new RequiredPlugin() { TaskId = entity.TaskId, PluginId = pluginId });
           }
         }
@@ -78 +78 @@
     public void DeleteJob(Guid id) {
       using (var db = CreateContext()) {
-        var entity = db.Jobs.FirstOrDefault(x => x.JobId == id);
-        if (entity != null) db.Jobs.DeleteOnSubmit(entity);
+        var entity = db.Tasks.FirstOrDefault(x => x.TaskId == id);
+        if (entity != null) db.Tasks.DeleteOnSubmit(entity);
         db.SubmitChanges(); // JobData and child jobs are deleted by db-trigger
       }
@@ -91 +91 @@
     /// <param name="finished">if true, all parent jobs which have FinishWhenChildJobsFinished=true are returned, otherwise only FinishWhenChildJobsFinished=false are returned</param>
     /// <returns></returns>
-    public IEnumerable<DT.Job> GetParentJobs(IEnumerable<Guid> resourceIds, int count, bool finished) {
+    public IEnumerable<DT.Task> GetParentJobs(IEnumerable<Guid> resourceIds, int count, bool finished) {
       using (var db = CreateContext()) {
         var query = from ar in db.AssignedResources
                     where resourceIds.Contains(ar.ResourceId)
-                       && ar.Job.State == JobState.Waiting
-                       && ar.Job.IsParentJob
-                       && (finished ? ar.Job.FinishWhenChildJobsFinished : !ar.Job.FinishWhenChildJobsFinished)
-                       && (from child in db.Jobs
-                           where child.ParentJobId == ar.Job.JobId
-                           select child.State == JobState.Finished
-                               || child.State == JobState.Aborted
-                               || child.State == JobState.Failed).All(x => x)
-                       && (from child in db.Jobs // avoid returning WaitForChildJobs jobs where no child-jobs exist (yet)
-                           where child.ParentJobId == ar.Job.JobId
+                       && ar.Task.State == TaskState.Waiting
+                       && ar.Task.IsParentTask
+                       && (finished ? ar.Task.FinishWhenChildJobsFinished : !ar.Task.FinishWhenChildJobsFinished)
+                       && (from child in db.Tasks
+                           where child.ParentTaskId == ar.Task.TaskId
+                           select child.State == TaskState.Finished
+                               || child.State == TaskState.Aborted
+                               || child.State == TaskState.Failed).All(x => x)
+                       && (from child in db.Tasks // avoid returning WaitForChildJobs jobs where no child-jobs exist (yet)
+                           where child.ParentTaskId == ar.Task.TaskId
                            select child).Count() > 0
-                    orderby ar.Job.Priority descending, db.Random()
-                    select DT.Convert.ToDto(ar.Job);
+                    orderby ar.Task.Priority descending, db.Random()
+                    select DT.Convert.ToDto(ar.Task);
         return count == 0 ? query.ToArray() : query.Take(count).ToArray();
       }
     }
 
-    public IEnumerable<DT.Job> GetWaitingJobs(DT.Slave slave, int count) {
+    public IEnumerable<DT.Task> GetWaitingJobs(DT.Slave slave, int count) {
       using (var db = CreateContext()) {
         var resourceIds = GetParentResources(slave.Id).Select(r => r.Id);
@@ -120 +120 @@
         var query = from ar in db.AssignedResources
                     where resourceIds.Contains(ar.ResourceId)
-                       && !(ar.Job.IsParentJob && ar.Job.FinishWhenChildJobsFinished)
-                       && ar.Job.State == JobState.Waiting
-                       && ar.Job.CoresNeeded <= slave.FreeCores
-                       && ar.Job.MemoryNeeded <= slave.FreeMemory
-                    orderby ar.Job.Priority descending, db.Random() // take random job to avoid the race condition that occurs when this method is called concurrently (the same job would be returned)
-                    select DT.Convert.ToDto(ar.Job);
+                       && !(ar.Task.IsParentTask && ar.Task.FinishWhenChildJobsFinished)
+                       && ar.Task.State == TaskState.Waiting
+                       && ar.Task.CoresNeeded <= slave.FreeCores
+                       && ar.Task.MemoryNeeded <= slave.FreeMemory
+                    orderby ar.Task.Priority descending, db.Random() // take random job to avoid the race condition that occurs when this method is called concurrently (the same job would be returned)
+                    select DT.Convert.ToDto(ar.Task);
         var waitingJobs = (count == 0 ? query : query.Take(count)).ToArray();
         return waitingJobs.Union(waitingParentJobs).OrderByDescending(x => x.Priority);
@@ -131 +131 @@
     }
 
-    public DT.Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
-      using (var db = CreateContext()) {
-        var job = db.Jobs.SingleOrDefault(x => x.JobId == jobId);
+    public DT.Task UpdateJobState(Guid jobId, TaskState jobState, Guid? slaveId, Guid? userId, string exception) {
+      using (var db = CreateContext()) {
+        var job = db.Tasks.SingleOrDefault(x => x.TaskId == jobId);
         job.State = jobState;
         db.StateLogs.InsertOnSubmit(new StateLog {
-          JobId = jobId,
+          TaskId = jobId,
           State = jobState,
           SlaveId = slaveId,
@@ -144 +144 @@
         });
         db.SubmitChanges();
-        job = db.Jobs.SingleOrDefault(x => x.JobId == jobId);
+        job = db.Tasks.SingleOrDefault(x => x.TaskId == jobId);
         return DT.Convert.ToDto(job);
       }
@@ -151 +151 @@
 
     #region JobData Methods
-    public DT.JobData GetJobData(Guid id) {
+    public DT.TaskData GetJobData(Guid id) {
       using (var db = CreateContext(true)) {
-        return DT.Convert.ToDto(db.JobDatas.SingleOrDefault(x => x.JobId == id));
-      }
-    }
-
-    public IEnumerable<DT.JobData> GetJobDatas(Expression<Func<JobData, bool>> predicate) {
+        return DT.Convert.ToDto(db.TaskDatas.SingleOrDefault(x => x.TaskId == id));
+      }
+    }
+
+    public IEnumerable<DT.TaskData> GetJobDatas(Expression<Func<TaskData, bool>> predicate) {
       using (var db = CreateContext(true)) {
-        return db.JobDatas.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();
-      }
-    }
-
-    public Guid AddJobData(DT.JobData dto) {
+        return db.TaskDatas.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();
+      }
+    }
+
+    public Guid AddJobData(DT.TaskData dto) {
       using (var db = CreateContext(true)) {
         var entity = DT.Convert.ToEntity(dto);
-        db.JobDatas.InsertOnSubmit(entity);
-        db.SubmitChanges();
-        return entity.JobId;
-      }
-    }
-
-    public void UpdateJobData(DT.JobData dto) {
+        db.TaskDatas.InsertOnSubmit(entity);
+        db.SubmitChanges();
+        return entity.TaskId;
+      }
+    }
+
+    public void UpdateJobData(DT.TaskData dto) {
       using (var db = CreateContext(true)) {
-        var entity = db.JobDatas.FirstOrDefault(x => x.JobId == dto.JobId);
-        if (entity == null) db.JobDatas.InsertOnSubmit(DT.Convert.ToEntity(dto));
+        var entity = db.TaskDatas.FirstOrDefault(x => x.TaskId == dto.TaskId);
+        if (entity == null) db.TaskDatas.InsertOnSubmit(DT.Convert.ToEntity(dto));
         else DT.Convert.ToEntity(dto, entity);
         db.SubmitChanges();
@@ -183 +183 @@
     public void DeleteJobData(Guid id) {
       using (var db = CreateContext()) {
-        var entity = db.JobDatas.FirstOrDefault(x => x.JobId == id); // check if all the byte[] is loaded into memory here. otherwise work around to delete without loading it
-        if (entity != null) db.JobDatas.DeleteOnSubmit(entity);
+        var entity = db.TaskDatas.FirstOrDefault(x => x.TaskId == id); // check if all the byte[] is loaded into memory here. otherwise work around to delete without loading it
+        if (entity != null) db.TaskDatas.DeleteOnSubmit(entity);
         db.SubmitChanges();
       }
@@ -241 +241 @@
         return null;
 
-      var jobs = db.Jobs.Where(j => j.HiveExperimentId == exp.Id);
+      var jobs = db.Tasks.Where(j => j.HiveExperimentId == exp.Id);
       exp.JobCount = jobs.Count();
-      exp.CalculatingCount = jobs.Count(j => j.State == JobState.Calculating);
-      exp.FinishedCount = jobs.Count(j => j.State == JobState.Finished);
+      exp.CalculatingCount = jobs.Count(j => j.State == TaskState.Calculating);
+      exp.FinishedCount = jobs.Count(j => j.State == TaskState.Finished);
       return exp;
     }
@@ -554 +554 @@
     public void AssignJobToResource(Guid jobId, Guid resourceId) {
       using (var db = CreateContext()) {
-        var job = db.Jobs.Where(x => x.JobId == jobId).Single();
-        job.AssignedResources.Add(new AssignedResource() { JobId = jobId, ResourceId = resourceId });
+        var job = db.Tasks.Where(x => x.TaskId == jobId).Single();
+        job.AssignedResources.Add(new AssignedResource() { TaskId = jobId, ResourceId = resourceId });
         db.SubmitChanges();
       }
@@ -562 +562 @@
     public IEnumerable<DT.Resource> GetAssignedResources(Guid jobId) {
       using (var db = CreateContext()) {
-        var job = db.Jobs.Where(x => x.JobId == jobId).Single();
+        var job = db.Tasks.Where(x => x.TaskId == jobId).Single();
         return job.AssignedResources.Select(x => DT.Convert.ToDto(x.Resource)).ToArray();
       }
@@ -598 +598 @@
     }
 
-    public IEnumerable<DT.Job> GetJobsByResourceId(Guid resourceId) {
+    public IEnumerable<DT.Task> GetJobsByResourceId(Guid resourceId) {
       using (var db = CreateContext()) {
         var resources = GetChildResources(resourceId).Select(x => x.Id).ToList();
         resources.Add(resourceId);
 
-        var jobs = db.Jobs.Where(j =>
-          j.State == JobState.Calculating &&
+        var jobs = db.Tasks.Where(j =>
+          j.State == TaskState.Calculating &&
           j.StateLogs.OrderByDescending(x => x.DateTime).First().SlaveId.HasValue &&
           resources.Contains(j.StateLogs.OrderByDescending(x => x.DateTime).First().SlaveId.Value));
@@ -631 +631 @@
     public Guid GetExperimentForJob(Guid jobId) {
       using (var db = CreateContext()) {
-        return db.Jobs.Single(j => j.JobId == jobId).HiveExperimentId;
+        return db.Tasks.Single(j => j.TaskId == jobId).HiveExperimentId;
       }
     }
@@ -743 +743 @@
         var userStats = new Dictionary<Guid, DT.UserStatistics>();
 
-        var usedCoresByUser = from job in db.Jobs
-                              where job.State == JobState.Calculating
+        var usedCoresByUser = from job in db.Tasks
+                              where job.State == TaskState.Calculating
                               group job by job.HiveExperiment.OwnerUserId into g
                               select new { UserId = g.Key, UsedCores = g.Count() };
@@ -755 +755 @@
         }
 
-        var executionTimesByUser = from job in db.Jobs
+        var executionTimesByUser = from job in db.Tasks
                                    group job by job.HiveExperiment.OwnerUserId into g
                                    select new { UserId = g.Key, ExecutionTime = TimeSpan.FromMilliseconds(g.Select(x => x.ExecutionTimeMs).Sum()) };
@@ -766 +766 @@
 
         // execution times only of finished jobs - necessary to compute efficieny
-        var executionTimesFinishedJobs = from job in db.Jobs
-                                         where job.State == JobState.Finished
+        var executionTimesFinishedJobs = from job in db.Tasks
+                                         where job.State == TaskState.Finished
                                          group job by job.HiveExperiment.OwnerUserId into g
                                          select new { UserId = g.Key, ExecutionTimeFinishedJobs = TimeSpan.FromMilliseconds(g.Select(x => x.ExecutionTimeMs).Sum()) };
@@ -779 +779 @@
 
         // start to end times only of finished jobs - necessary to compute efficiency
-        var startToEndTimesFinishedJobs = from job in db.Jobs
-                                          where job.State == JobState.Finished
+        var startToEndTimesFinishedJobs = from job in db.Tasks
+                                          where job.State == TaskState.Finished
                                           group job by job.HiveExperiment.OwnerUserId into g
                                           select new {
@@ -817 +817 @@
 
     #region Helpers
-    private void CollectChildJobs(HiveDataContext db, Guid parentJobId, List<Job> collection) {
-      var jobs = db.Jobs.Where(j => j.ParentJobId == parentJobId);
+    private void CollectChildJobs(HiveDataContext db, Guid parentJobId, List<Task> collection) {
+      var jobs = db.Tasks.Where(j => j.ParentTaskId == parentJobId);
       foreach (var job in jobs) {
         collection.Add(job);
-        if (job.IsParentJob)
-          CollectChildJobs(db, job.JobId, collection);
+        if (job.IsParentTask)
+          CollectChildJobs(db, job.TaskId, collection);
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -61 +61 @@
 
     #region Job Methods
-    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
+    public Guid AddJob(Task job, TaskData jobData, IEnumerable<Guid> resourceIds) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
         job.Id = dao.AddJob(job);
-        jobData.JobId = job.Id;
+        jobData.TaskId = job.Id;
         jobData.LastUpdate = DateTime.Now;
         foreach (Guid slaveGroupId in resourceIds) {
@@ -71 +71 @@
         }
         dao.AddJobData(jobData);
-        dao.UpdateJobState(job.Id, DA.JobState.Waiting, null, userManager.CurrentUserId, null);
-        return jobData.JobId;
+        dao.UpdateJobState(job.Id, DA.TaskState.Waiting, null, userManager.CurrentUserId, null);
+        return jobData.TaskId;
       }, false, true);
     }
 
-    public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
-      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
-        job.ParentJobId = parentJobId;
+    public Guid AddChildJob(Guid parentJobId, Task job, TaskData jobData) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      return trans.UseTransaction(() => {
+        job.ParentTaskId = parentJobId;
         return AddJob(job, jobData, dao.GetAssignedResources(parentJobId).Select(x => x.Id));
       }, false, true);
     }
 
-    public Job GetJob(Guid jobId) {
+    public Task GetJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForJob(jobId, Permission.Read);
@@ -90 +90 @@
     }
 
-    public IEnumerable<Job> GetJobs() {
+    public IEnumerable<Task> GetJobs() {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       var jobs = dao.GetJobs(x => true);
@@ -98 +98 @@
     }
 
-    public IEnumerable<LightweightJob> GetLightweightJobs(IEnumerable<Guid> jobIds) {
-      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      var jobs = dao.GetJobs(x => jobIds.Contains(x.JobId)).Select(x => new LightweightJob(x)).ToArray();
+    public IEnumerable<LightweightTask> GetLightweightJobs(IEnumerable<Guid> jobIds) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      var jobs = dao.GetJobs(x => jobIds.Contains(x.TaskId)).Select(x => new LightweightTask(x)).ToArray();
       foreach (var job in jobs)
         author.AuthorizeForJob(job.Id, Permission.Read);
@@ -106 +106 @@
     }
 
-    public IEnumerable<LightweightJob> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
-      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      var jobs = GetChildJobs(parentJobId, recursive, includeParent).Select(x => new LightweightJob(x)).ToArray();
+    public IEnumerable<LightweightTask> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      var jobs = GetChildJobs(parentJobId, recursive, includeParent).Select(x => new LightweightTask(x)).ToArray();
       foreach (var job in jobs)
         author.AuthorizeForJob(job.Id, Permission.Read);
@@ -114 +114 @@
     }
 
-    public IEnumerable<LightweightJob> GetLightweightExperimentJobs(Guid experimentId) {
+    public IEnumerable<LightweightTask> GetLightweightExperimentJobs(Guid experimentId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       author.AuthorizeForExperiment(experimentId, Permission.Read);
-      return dao.GetJobs(x => x.HiveExperimentId == experimentId).Select(x => new LightweightJob(x)).ToArray();
-    }
-
-    public JobData GetJobData(Guid jobId) {
+      return dao.GetJobs(x => x.HiveExperimentId == experimentId).Select(x => new LightweightTask(x)).ToArray();
+    }
+
+    public TaskData GetJobData(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForJob(jobId, Permission.Read);
@@ -126 +126 @@
     }
 
-    public void UpdateJob(Job job) {
+    public void UpdateJob(Task job) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForJob(job.Id, Permission.Full);
@@ -134 +134 @@
     }
 
-    public void UpdateJobData(Job job, JobData jobData) {
+    public void UpdateJobData(Task job, TaskData jobData) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForJob(job.Id, Permission.Full);
-      author.AuthorizeForJob(jobData.JobId, Permission.Full);
+      author.AuthorizeForJob(jobData.TaskId, Permission.Full);
       //trans.UseTransaction(() => { // cneumuel: try without transaction
       jobData.LastUpdate = DateTime.Now;
@@ -165 +165 @@
     }
 
-    public Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
+    public Task UpdateJobState(Guid jobId, TaskState jobState, Guid? slaveId, Guid? userId, string exception) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForJob(jobId, Permission.Full);
       return trans.UseTransaction(() => {
-        Job job = dao.UpdateJobState(jobId, DataTransfer.Convert.ToEntity(jobState), slaveId, userId, exception);
-
-        if (job.Command.HasValue && job.Command.Value == Command.Pause && job.State == JobState.Paused) {
+        Task job = dao.UpdateJobState(jobId, DataTransfer.Convert.ToEntity(jobState), slaveId, userId, exception);
+
+        if (job.Command.HasValue && job.Command.Value == Command.Pause && job.State == TaskState.Paused) {
           job.Command = null;
-        } else if (job.Command.HasValue && job.Command.Value == Command.Abort && job.State == JobState.Aborted) {
+        } else if (job.Command.HasValue && job.Command.Value == Command.Abort && job.State == TaskState.Aborted) {
           job.Command = null;
-        } else if (job.Command.HasValue && job.Command.Value == Command.Stop && job.State == JobState.Aborted) {
+        } else if (job.Command.HasValue && job.Command.Value == Command.Stop && job.State == TaskState.Aborted) {
           job.Command = null;
-        } else if (jobState == JobState.Paused && !job.Command.HasValue) {
+        } else if (jobState == TaskState.Paused && !job.Command.HasValue) {
           // slave paused and uploaded the job (no user-command) -> set waiting.
-          job = dao.UpdateJobState(jobId, DataTransfer.Convert.ToEntity(JobState.Waiting), slaveId, userId, exception);
+          job = dao.UpdateJobState(jobId, DataTransfer.Convert.ToEntity(TaskState.Waiting), slaveId, userId, exception);
         }
 
@@ -187 +187 @@
     }
 
-    public IEnumerable<Job> GetJobsByResourceId(Guid resourceId) {
+    public IEnumerable<Task> GetJobsByResourceId(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       var jobs = trans.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
@@ -202 +202 @@
       trans.UseTransaction(() => {
         var job = dao.GetJob(jobId);
-        if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
+        if (job.State == TaskState.Calculating || job.State == TaskState.Transferring) {
           job.Command = Command.Stop;
           dao.UpdateJob(job);
         } else {
-          if (job.State != JobState.Aborted && job.State != JobState.Finished && job.State != JobState.Failed) {
-            job = UpdateJobState(jobId, JobState.Aborted, null, null, string.Empty);
+          if (job.State != TaskState.Aborted && job.State != TaskState.Finished && job.State != TaskState.Failed) {
+            job = UpdateJobState(jobId, TaskState.Aborted, null, null, string.Empty);
           }
         }
@@ -218 +218 @@
       trans.UseTransaction(() => {
         var job = dao.GetJob(jobId);
-        if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
+        if (job.State == TaskState.Calculating || job.State == TaskState.Transferring) {
           job.Command = Command.Pause;
           dao.UpdateJob(job);
         } else {
-          job = UpdateJobState(jobId, JobState.Paused, null, null, string.Empty);
+          job = UpdateJobState(jobId, TaskState.Paused, null, null, string.Empty);
         }
       });
@@ -231 +231 @@
       author.AuthorizeForJob(jobId, Permission.Full);
       trans.UseTransaction(() => {
-        Job job = dao.UpdateJobState(jobId, DA.JobState.Waiting, null, userManager.CurrentUserId, string.Empty);
+        Task job = dao.UpdateJobState(jobId, DA.TaskState.Waiting, null, userManager.CurrentUserId, string.Empty);
         job.Command = null;
         dao.UpdateJob(job);
@@ -591 +591 @@
 
     #region Helper Methods
-    private IEnumerable<Job> GetChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
-      var jobs = new List<Job>(dao.GetJobs(x => parentJobId == null ? !x.ParentJobId.HasValue : x.ParentJobId.Value == parentJobId));
+    private IEnumerable<Task> GetChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
+      var jobs = new List<Task>(dao.GetJobs(x => parentJobId == null ? !x.ParentTaskId.HasValue : x.ParentTaskId.Value == parentJobId));
 
       if (recursive) {
-        var childs = new List<Job>();
+        var childs = new List<Task>();
         foreach (var job in jobs) {
           childs.AddRange(GetChildJobs(job.Id, recursive, false));

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs

@@ -29 +29 @@
   public interface IHiveDao {
     #region Job Methods
-    DT.Job GetJob(Guid id);
-    IEnumerable<DT.Job> GetJobs(Expression<Func<Job, bool>> predicate);
-    Guid AddJob(DT.Job dto);
-    void UpdateJob(DT.Job dto);
+    DT.Task GetJob(Guid id);
+    IEnumerable<DT.Task> GetJobs(Expression<Func<Task, bool>> predicate);
+    Guid AddJob(DT.Task dto);
+    void UpdateJob(DT.Task dto);
     void DeleteJob(Guid id);
-    IEnumerable<DT.Job> GetWaitingJobs(DT.Slave slave, int count);
-    IEnumerable<DT.Job> GetParentJobs(IEnumerable<Guid> resourceIds, int count, bool finished);
-    DT.Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception);
+    IEnumerable<DT.Task> GetWaitingJobs(DT.Slave slave, int count);
+    IEnumerable<DT.Task> GetParentJobs(IEnumerable<Guid> resourceIds, int count, bool finished);
+    DT.Task UpdateJobState(Guid jobId, TaskState jobState, Guid? slaveId, Guid? userId, string exception);
     #endregion
 
     #region JobData Methods
-    DT.JobData GetJobData(Guid id);
-    IEnumerable<DT.JobData> GetJobDatas(Expression<Func<JobData, bool>> predicate);
-    Guid AddJobData(DT.JobData dto);
-    void UpdateJobData(DT.JobData dto);
+    DT.TaskData GetJobData(Guid id);
+    IEnumerable<DT.TaskData> GetJobDatas(Expression<Func<TaskData, bool>> predicate);
+    Guid AddJobData(DT.TaskData dto);
+    void UpdateJobData(DT.TaskData dto);
     void DeleteJobData(Guid id);
     #endregion
@@ -117 +117 @@
     IEnumerable<DT.Resource> GetParentResources(Guid resourceId);
     IEnumerable<DT.Resource> GetChildResources(Guid resourceId);
-    IEnumerable<DT.Job> GetJobsByResourceId(Guid resourceId);
+    IEnumerable<DT.Task> GetJobsByResourceId(Guid resourceId);
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Services.Hive.DataAccess;
 using HeuristicLab.Services.Hive.DataAccess;
 using DT = HeuristicLab.Services.Hive.DataTransfer;
@@ -92 +91 @@
       var parentJobsToFinish = dao.GetParentJobs(dao.GetResources(x => true).Select(x => x.Id), 0, true);
       foreach (var job in parentJobsToFinish) {
-        dao.UpdateJobState(job.Id, JobState.Finished, null, null, string.Empty);
+        dao.UpdateJobState(job.Id, TaskState.Finished, null, null, string.Empty);
       }
     }
 
     private void SetJobsWaiting(Guid slaveId) {
-      var jobs = dao.GetJobs(x => x.State == JobState.Calculating).Where(x => x.StateLog.Last().SlaveId == slaveId);
+      var jobs = dao.GetJobs(x => x.State == TaskState.Calculating).Where(x => x.StateLog.Last().SlaveId == slaveId);
       foreach (var j in jobs) {
-        DT.Job job = dao.UpdateJobState(j.Id, JobState.Waiting, slaveId, null, "Slave timed out.");
+        DT.Task job = dao.UpdateJobState(j.Id, TaskState.Waiting, slaveId, null, "Slave timed out.");
         job.Command = null;
         dao.UpdateJob(job);
@@ -109 +108 @@
     /// </summary>
     private void SetTimeoutJobsWaiting() {
-      var jobs = dao.GetJobs(x => (x.State == JobState.Calculating && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.CalculatingJobHeartbeatTimeout)
-                               || (x.State == JobState.Transferring && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.TransferringJobHeartbeatTimeout));
+      var jobs = dao.GetJobs(x => (x.State == TaskState.Calculating && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.CalculatingJobHeartbeatTimeout)
+                               || (x.State == TaskState.Transferring && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.TransferringJobHeartbeatTimeout));
       foreach (var j in jobs) {
-        DT.Job job = dao.UpdateJobState(j.Id, JobState.Waiting, null, null, "Slave timed out.");
+        DT.Task job = dao.UpdateJobState(j.Id, TaskState.Waiting, null, null, "Slave timed out.");
         job.Command = null;
         dao.UpdateJob(job);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -71 +71 @@
 
     // returns true if assignment was successful
-    private bool AssignJob(Slave slave, Job job) {
+    private bool AssignJob(Slave slave, Task job) {
       // load job again and check if it is still available (this is an attempt to reduce the race condition which causes multiple heartbeats to get the same job assigned)
-      if (dao.GetJob(job.Id).State != JobState.Waiting) return false;
+      if (dao.GetJob(job.Id).State != TaskState.Waiting) return false;
 
-      job = dao.UpdateJobState(job.Id, DataAccess.JobState.Transferring, slave.Id, null, null);
+      job = dao.UpdateJobState(job.Id, DataAccess.TaskState.Transferring, slave.Id, null, null);
 
       // from now on the job has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)
@@ -98 +98 @@
         // process the jobProgresses
         foreach (var jobProgress in heartbeat.JobProgress) {
-          Job curJob = dao.GetJob(jobProgress.Key);
+          Task curJob = dao.GetJob(jobProgress.Key);
           if (curJob == null) {
             // job does not exist in db
@@ -135 +135 @@
     }
 
-    private bool JobIsAllowedToBeCalculatedBySlave(Guid slaveId, Job curJob) {
+    private bool JobIsAllowedToBeCalculatedBySlave(Guid slaveId, Task curJob) {
       var assignedResourceIds = dao.GetAssignedResources(curJob.Id).Select(x => x.Id);
       var slaveResourceIds = dao.GetParentResources(slaveId).Select(x => x.Id);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/MessageContainer.cs

@@ -28 +28 @@
   /// <summary>
   /// The MessageContainer is a container class for Messages. Its two parts are:
-  /// the actual message itself and the JobId, refered by the message
+  /// the actual message itself and the TaskId, refered by the message
   /// </summary>
   [StorableClass]
@@ -56 +56 @@
     [Storable]
     [DataMember]
-    public Guid JobId { get; set; }
+    public Guid TaskId { get; set; }
 
     [StorableConstructor]
@@ -63 +63 @@
     public MessageContainer(MessageType message) {
       Message = message;
-      JobId = Guid.Empty;
+      TaskId = Guid.Empty;
     }
     public MessageContainer(MessageType message, Guid jobId) {
       Message = message;
-      JobId = jobId;
+      TaskId = jobId;
     }
     protected MessageContainer(MessageContainer original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
       this.Message = original.Message;
-      this.JobId = original.JobId;
+      this.TaskId = original.TaskId;
     }
     public virtual IDeepCloneable Clone(Cloner cloner) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -33 +33 @@
     #region Job Methods
     [OperationContract]
-    Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds);
-
-    [OperationContract]
-    Guid AddChildJob(Guid parentJobId, Job job, JobData jobData);
-
-    [OperationContract]
-    Job GetJob(Guid jobId);
-
-    [OperationContract]
-    IEnumerable<Job> GetJobs();
-
-    [OperationContract]
-    IEnumerable<LightweightJob> GetLightweightJobs(IEnumerable<Guid> jobIds);
-
-    [OperationContract]
-    IEnumerable<LightweightJob> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent);
-
-    [OperationContract]
-    IEnumerable<LightweightJob> GetLightweightExperimentJobs(Guid experimentId);
-
-    [OperationContract]
-    JobData GetJobData(Guid jobId);
-
-    [OperationContract]
-    void UpdateJob(Job jobDto);
-
-    [OperationContract]
-    void UpdateJobData(Job jobDto, JobData jobDataDto);
+    Guid AddJob(Task job, TaskData jobData, IEnumerable<Guid> resourceIds);
+
+    [OperationContract]
+    Guid AddChildJob(Guid parentJobId, Task job, TaskData jobData);
+
+    [OperationContract]
+    Task GetJob(Guid jobId);
+
+    [OperationContract]
+    IEnumerable<Task> GetJobs();
+
+    [OperationContract]
+    IEnumerable<LightweightTask> GetLightweightJobs(IEnumerable<Guid> jobIds);
+
+    [OperationContract]
+    IEnumerable<LightweightTask> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent);
+
+    [OperationContract]
+    IEnumerable<LightweightTask> GetLightweightExperimentJobs(Guid experimentId);
+
+    [OperationContract]
+    TaskData GetJobData(Guid jobId);
+
+    [OperationContract]
+    void UpdateJob(Task jobDto);
+
+    [OperationContract]
+    void UpdateJobData(Task jobDto, TaskData jobDataDto);
 
     [OperationContract]
@@ -69 +69 @@
 
     [OperationContract]
-    Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception);
+    Task UpdateJobState(Guid jobId, TaskState jobState, Guid? slaveId, Guid? userId, string exception);
     #endregion
 
@@ -194 +194 @@
 
     [OperationContract]
-    IEnumerable<Job> GetJobsByResourceId(Guid resourceId);
+    IEnumerable<Task> GetJobsByResourceId(Guid resourceId);
 
     [OperationContract]