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

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.DataAccess/3.3

Files:

• Enums/TaskState.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/JobState.cs) (1 diff)
• HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (1 diff)
• HiveDataContext.dbml (modified) (5 diffs)
• HiveDataContext.dbml.layout (modified) (6 diffs)
• HiveDataContext.designer.cs (modified) (79 diffs)
• SQL Scripts/Initialize Hive Database.sql (modified) (6 diffs)
• SQL Scripts/Prepare Hive Database.sql (modified) (10 diffs)
• SQL Scripts/Query Jobs.sql (modified) (2 diffs)

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

@@ -24 +24 @@
 namespace HeuristicLab.Services.Hive.DataAccess {
   [Serializable]
-  public enum JobState {
+  public enum TaskState {
     /// <summary>
     /// A job is offline as long as he is not yet submitted to the hive

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

@@ -107 +107 @@
     </Compile>
     <Compile Include="ITransactionManager.cs" />
-    <Compile Include="Enums\JobState.cs" />
+    <Compile Include="Enums\TaskState.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="Enums\Permission.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

@@ -4 +4 @@
     <Type Name="AssignedResource">
       <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
+      <Column Name="TaskId" Storage="_JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
       <Association Name="Resource_AssignedResource" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" />
-      <Association Name="Job_AssignedResource" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" DeleteRule="CASCADE" />
+      <Association Name="Task_AssignedResource" Member="Task" Storage="_Job" ThisKey="TaskId" OtherKey="TaskId" Type="Task" IsForeignKey="true" DeleteRule="CASCADE" />
     </Type>
   </Table>
@@ -24 +24 @@
     <Type Name="RequiredPlugin">
       <Column Name="RequiredPluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" UpdateCheck="Never" />
-      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
+      <Column Name="TaskId" Storage="_JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
       <Column Name="PluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
       <Association Name="Plugin_RequiredPlugin" Member="Plugin" Storage="_PluginInfo" ThisKey="PluginId" OtherKey="PluginId" Type="Plugin" IsForeignKey="true" DeleteRule="CASCADE" />
-      <Association Name="Job_RequiredPlugin" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
+      <Association Name="Task_RequiredPlugin" Member="Task" Storage="_Job" ThisKey="TaskId" OtherKey="TaskId" Type="Task" IsForeignKey="true" />
     </Type>
   </Table>
@@ -58 +58 @@
     </Type>
   </Table>
-  <Table Name="dbo.Job" Member="Jobs">
-    <Type Name="Job">
-      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
-      <Column Name="JobState" Member="State" Type="global::HeuristicLab.Services.Hive.DataAccess.JobState" DbType="VarChar(30)" CanBeNull="false" />
+  <Table Name="dbo.Task" Member="Tasks">
+    <Type Name="Task">
+      <Column Name="TaskId" Storage="_JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
+      <Column Name="TaskState" Member="State" Type="global::HeuristicLab.Services.Hive.DataAccess.TaskState" DbType="VarChar(30)" CanBeNull="false" />
       <Column Name="ExecutionTimeMs" Storage="_ExecutionTime" Type="System.Double" DbType="float" CanBeNull="false" />
       <Column Name="LastHeartbeat" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
-      <Column Name="ParentJobId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
+      <Column Name="ParentTaskId" Storage="_ParentJobId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
       <Column Name="Priority" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
       <Column Name="CoresNeeded" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
       <Column Name="MemoryNeeded" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
-      <Column Name="IsParentJob" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
+      <Column Name="IsParentTask" Storage="_IsParentJob" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
       <Column Name="FinishWhenChildJobsFinished" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
       <Column Name="Command" Type="global::HeuristicLab.Services.Hive.DataAccess.Command?" DbType="VarChar(30)" CanBeNull="true" />
       <Column Name="HiveExperimentId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
       <Column Name="IsPrivileged" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
-      <Association Name="Job_AssignedResource" Member="AssignedResources" ThisKey="JobId" OtherKey="JobId" Type="AssignedResource" />
-      <Association Name="Job_RequiredPlugin" Member="RequiredPlugins" ThisKey="JobId" OtherKey="JobId" Type="RequiredPlugin" />
-      <Association Name="Job_Job" Member="ChildJobs" Storage="_Jobs" ThisKey="JobId" OtherKey="ParentJobId" Type="Job" />
-      <Association Name="Job_JobData" Member="JobData" ThisKey="JobId" OtherKey="JobId" Type="JobData" Cardinality="One" />
-      <Association Name="Job_StateLog" Member="StateLogs" ThisKey="JobId" OtherKey="JobId" Type="StateLog" />
-      <Association Name="Job_Job" Member="ParentJob" Storage="_Job1" ThisKey="ParentJobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
-      <Association Name="HiveExperiment_Job" Member="HiveExperiment" ThisKey="HiveExperimentId" OtherKey="HiveExperimentId" Type="HiveExperiment" IsForeignKey="true" />
+      <Association Name="Task_AssignedResource" Member="AssignedResources" ThisKey="TaskId" OtherKey="TaskId" Type="AssignedResource" />
+      <Association Name="Task_RequiredPlugin" Member="RequiredPlugins" ThisKey="TaskId" OtherKey="TaskId" Type="RequiredPlugin" />
+      <Association Name="Task_Task" Member="ChildJobs" Storage="_Jobs" ThisKey="TaskId" OtherKey="ParentTaskId" Type="Task" />
+      <Association Name="Task_TaskData" Member="JobData" ThisKey="TaskId" OtherKey="TaskId" Type="TaskData" Cardinality="One" />
+      <Association Name="Task_StateLog" Member="StateLogs" ThisKey="TaskId" OtherKey="TaskId" Type="StateLog" />
+      <Association Name="Task_Task" Member="ParentJob" Storage="_Job1" ThisKey="ParentTaskId" OtherKey="TaskId" Type="Task" IsForeignKey="true" />
+      <Association Name="HiveExperiment_Task" Member="HiveExperiment" ThisKey="HiveExperimentId" OtherKey="HiveExperimentId" Type="HiveExperiment" IsForeignKey="true" />
     </Type>
   </Table>
@@ -104 +104 @@
       <Column Name="LastAccessed" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
       <Column Name="IsHiveEngine" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
-      <Association Name="HiveExperiment_Job" Member="Jobs" ThisKey="HiveExperimentId" OtherKey="HiveExperimentId" Type="Job" />
+      <Association Name="HiveExperiment_Task" Member="Tasks" Storage="_Jobs" ThisKey="HiveExperimentId" OtherKey="HiveExperimentId" Type="Task" />
       <Association Name="HiveExperiment_HiveExperimentPermission" Member="HiveExperimentPermissions" ThisKey="HiveExperimentId" OtherKey="HiveExperimentId" Type="HiveExperimentPermission" />
     </Type>
   </Table>
-  <Table Name="dbo.JobData" Member="JobDatas">
-    <Type Name="JobData">
-      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
+  <Table Name="dbo.TaskData" Member="TaskDatas">
+    <Type Name="TaskData">
+      <Column Name="TaskId" Storage="_JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
       <Column Name="Data" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX)" CanBeNull="false" UpdateCheck="Never" />
       <Column Name="LastUpdate" Type="System.DateTime" DbType="DateTime" CanBeNull="false" />
-      <Association Name="Job_JobData" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
+      <Association Name="Task_TaskData" Member="Task" Storage="_Job" ThisKey="TaskId" OtherKey="TaskId" Type="Task" IsForeignKey="true" />
     </Type>
   </Table>
@@ -128 +128 @@
     <Type Name="StateLog">
       <Column Name="StateLogId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
-      <Column Name="State" Type="global::HeuristicLab.Services.Hive.DataAccess.JobState" DbType="VarChar(30) NOT NULL" CanBeNull="false" />
+      <Column Name="State" Type="global::HeuristicLab.Services.Hive.DataAccess.TaskState" DbType="VarChar(30) NOT NULL" CanBeNull="false" />
       <Column Name="DateTime" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
-      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
+      <Column Name="TaskId" Storage="_JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
       <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
       <Column Name="SlaveId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
       <Column Name="Exception" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
-      <Association Name="Job_StateLog" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
+      <Association Name="Task_StateLog" Member="Task" Storage="_Job" ThisKey="TaskId" OtherKey="TaskId" Type="Task" IsForeignKey="true" />
       <Association Name="Resource_StateLog" Member="Resource" ThisKey="SlaveId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" />
     </Type>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout

@@ -28 +28 @@
     </classShape>
     <classShape Id="695bfc39-59f3-4e60-8644-f847964bf62c" absoluteBounds="6.5, 1, 2, 3.3093082682291666">
-      <DataClassMoniker Name="/HiveDataContext/Job" />
+      <DataClassMoniker Name="/HiveDataContext/Task" />
       <nestedChildShapes>
         <elementListCompartment Id="a6a30e11-03d1-4869-82e6-b733f4ef9974" absoluteBounds="6.5150000000000006, 1.46, 1.9700000000000002, 2.7493082682291665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
@@ -76 +76 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.751650890625); (8.875 : 4.751650890625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Job/Job_AssignedResource" />
-      <nodes>
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-        <classShapeMoniker Id="a929c9dc-69f4-4488-ba1c-a2342bf81d89" />
-      </nodes>
-    </associationConnector>
-    <associationConnector edgePoints="[(7.0893551015625 : 4.30930826822917); (7.0893551015625 : 5.5)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Job/Job_RequiredPlugin" />
-      <nodes>
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-        <classShapeMoniker Id="97b00810-fa30-457e-b484-b4e80b22f91b" />
-      </nodes>
-    </associationConnector>
-    <associationConnector edgePoints="[(7.20923076923077 : 1); (7.20923076923077 : 0.75); (7.80461538461539 : 0.75); (7.80461538461539 : 1)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Job/Job_Job" />
-      <nodes>
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-      </nodes>
-    </associationConnector>
     <classShape Id="6bc13f26-f9a8-4597-b054-35be34190d12" absoluteBounds="4.125, 1, 2, 1.3862939453125">
-      <DataClassMoniker Name="/HiveDataContext/JobData" />
+      <DataClassMoniker Name="/HiveDataContext/TaskData" />
       <nestedChildShapes>
         <elementListCompartment Id="a068522c-7974-4679-b356-e33c941c465b" absoluteBounds="4.14, 1.46, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
@@ -116 +95 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Job/Job_JobData" />
-      <nodes>
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-        <classShapeMoniker Id="6bc13f26-f9a8-4597-b054-35be34190d12" />
-      </nodes>
-    </associationConnector>
     <associationConnector edgePoints="[(8.875 : 6.19314697265625); (8.5 : 6.19314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_RequiredPlugin" />
@@ -149 +121 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(6.5 : 2.50564697265625); (3.75 : 2.50564697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Job/Job_StateLog" />
-      <nodes>
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-        <classShapeMoniker Id="00352397-340e-449a-8e23-6ddd216e8617" />
-      </nodes>
-    </associationConnector>
     <associationConnector edgePoints="[(11.25 : 1.78929768880208); (10.9375 : 1.78929768880208); (10.9375 : 0.6875); (2.75 : 0.6875); (2.75 : 1)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_StateLog" />
@@ -176 +141 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(6.125 : 3.46715413411458); (6.5 : 3.46715413411458)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/HiveExperiment/HiveExperiment_Job" />
-      <nodes>
-        <classShapeMoniker Id="e6f840cc-2968-4be1-b234-eef624ccacbb" />
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-      </nodes>
-    </associationConnector>
     <classShape Id="cdddf4da-eaef-46a1-9cfd-987bb6b3d03e" absoluteBounds="17, 3.125, 2.5, 1.7708968098958327">
       <DataClassMoniker Name="/HiveDataContext/DeletedJobStatistics" />
@@ -228 +186 @@
       </nodes>
     </associationConnector>
+    <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.751650890625); (7.97916666666667 : 4.751650890625 : JumpStart); (8.14583333333333 : 4.751650890625 : JumpEnd); (8.875 : 4.751650890625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+      <AssociationMoniker Name="/HiveDataContext/Task/Task_AssignedResource" />
+      <nodes>
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+        <classShapeMoniker Id="a929c9dc-69f4-4488-ba1c-a2342bf81d89" />
+      </nodes>
+    </associationConnector>
+    <associationConnector edgePoints="[(8.0625 : 4.30930826822917); (8.0625 : 5.5)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+      <AssociationMoniker Name="/HiveDataContext/Task/Task_RequiredPlugin" />
+      <nodes>
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+        <classShapeMoniker Id="97b00810-fa30-457e-b484-b4e80b22f91b" />
+      </nodes>
+    </associationConnector>
+    <associationConnector edgePoints="[(7.20923076923077 : 1); (7.20923076923077 : 0.875); (7.80461538461539 : 0.875); (7.80461538461539 : 1)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+      <AssociationMoniker Name="/HiveDataContext/Task/Task_Task" />
+      <nodes>
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+      </nodes>
+    </associationConnector>
+    <associationConnector edgePoints="[(6.125 : 3.46715413411458); (6.5 : 3.46715413411458)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+      <AssociationMoniker Name="/HiveDataContext/HiveExperiment/HiveExperiment_Task" />
+      <nodes>
+        <classShapeMoniker Id="e6f840cc-2968-4be1-b234-eef624ccacbb" />
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+      </nodes>
+    </associationConnector>
+    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+      <AssociationMoniker Name="/HiveDataContext/Task/Task_TaskData" />
+      <nodes>
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+        <classShapeMoniker Id="6bc13f26-f9a8-4597-b054-35be34190d12" />
+      </nodes>
+    </associationConnector>
+    <associationConnector edgePoints="[(6.5 : 2.50564697265625); (3.75 : 2.50564697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+      <AssociationMoniker Name="/HiveDataContext/Task/Task_StateLog" />
+      <nodes>
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+        <classShapeMoniker Id="00352397-340e-449a-8e23-6ddd216e8617" />
+      </nodes>
+    </associationConnector>
   </nestedChildShapes>
 </ordesignerObjectsDiagram>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

@@ -43 +43 @@
     partial void UpdateResource(Resource instance);
     partial void DeleteResource(Resource instance);
-    partial void InsertJob(Job instance);
-    partial void UpdateJob(Job instance);
-    partial void DeleteJob(Job instance);
+    partial void InsertTask(Task instance);
+    partial void UpdateTask(Task instance);
+    partial void DeleteTask(Task instance);
     partial void InsertDowntime(Downtime instance);
     partial void UpdateDowntime(Downtime instance);
@@ -52 +52 @@
     partial void UpdateHiveExperiment(HiveExperiment instance);
     partial void DeleteHiveExperiment(HiveExperiment instance);
-    partial void InsertJobData(JobData instance);
-    partial void UpdateJobData(JobData instance);
-    partial void DeleteJobData(JobData instance);
+    partial void InsertTaskData(TaskData instance);
+    partial void UpdateTaskData(TaskData instance);
+    partial void DeleteTaskData(TaskData instance);
     partial void InsertPluginData(PluginData instance);
     partial void UpdatePluginData(PluginData instance);
@@ -143 +143 @@
     }
     
-    public System.Data.Linq.Table<Job> Jobs
-    {
-      get
-      {
-        return this.GetTable<Job>();
+    public System.Data.Linq.Table<Task> Tasks
+    {
+      get
+      {
+        return this.GetTable<Task>();
       }
     }
@@ -167 +167 @@
     }
     
-    public System.Data.Linq.Table<JobData> JobDatas
-    {
-      get
-      {
-        return this.GetTable<JobData>();
+    public System.Data.Linq.Table<TaskData> TaskDatas
+    {
+      get
+      {
+        return this.GetTable<TaskData>();
       }
     }
@@ -252 +252 @@
     private EntityRef<Resource> _Resource;
     
-    private EntityRef<Job> _Job;
+    private EntityRef<Task> _Job;
     
     #region Extensibility Method Definitions
@@ -260 +260 @@
     partial void OnResourceIdChanging(System.Guid value);
     partial void OnResourceIdChanged();
-    partial void OnJobIdChanging(System.Guid value);
-    partial void OnJobIdChanged();
+    partial void OnTaskIdChanging(System.Guid value);
+    partial void OnTaskIdChanged();
     #endregion
     
@@ -267 +267 @@
     {
       this._Resource = default(EntityRef<Resource>);
-      this._Job = default(EntityRef<Job>);
+      this._Job = default(EntityRef<Task>);
       OnCreated();
     }
@@ -296 +296 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid JobId
+    public System.Guid TaskId
     {
       get
@@ -310 +310 @@
             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
           }
-          this.OnJobIdChanging(value);
+          this.OnTaskIdChanging(value);
           this.SendPropertyChanging();
           this._JobId = value;
-          this.SendPropertyChanged("JobId");
-          this.OnJobIdChanged();
+          this.SendPropertyChanged("TaskId");
+          this.OnTaskIdChanged();
         }
       }
@@ -353 +353 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_AssignedResource", Storage="_Job", ThisKey="JobId", OtherKey="JobId", IsForeignKey=true, DeleteRule="CASCADE")]
-    public Job Job
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_AssignedResource", Storage="_Job", ThisKey="TaskId", OtherKey="TaskId", IsForeignKey=true, DeleteRule="CASCADE")]
+    public Task Task
     {
       get
@@ -362 +362 @@
       set
       {
-        Job previousValue = this._Job.Entity;
+        Task previousValue = this._Job.Entity;
         if (((previousValue != value) 
               || (this._Job.HasLoadedOrAssignedValue == false)))
@@ -376 +376 @@
           {
             value.AssignedResources.Add(this);
-            this._JobId = value.JobId;
+            this._JobId = value.TaskId;
           }
           else
@@ -382 +382 @@
             this._JobId = default(System.Guid);
           }
-          this.SendPropertyChanged("Job");
+          this.SendPropertyChanged("Task");
         }
       }
@@ -660 +660 @@
     private EntityRef<Plugin> _PluginInfo;
     
-    private EntityRef<Job> _Job;
+    private EntityRef<Task> _Job;
     
     #region Extensibility Method Definitions
@@ -668 +668 @@
     partial void OnRequiredPluginIdChanging(System.Guid value);
     partial void OnRequiredPluginIdChanged();
-    partial void OnJobIdChanging(System.Guid value);
-    partial void OnJobIdChanged();
+    partial void OnTaskIdChanging(System.Guid value);
+    partial void OnTaskIdChanged();
     partial void OnPluginIdChanging(System.Guid value);
     partial void OnPluginIdChanged();
@@ -677 +677 @@
     {
       this._PluginInfo = default(EntityRef<Plugin>);
-      this._Job = default(EntityRef<Job>);
+      this._Job = default(EntityRef<Task>);
       OnCreated();
     }
@@ -702 +702 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", DbType="UniqueIdentifier NOT NULL")]
-    public System.Guid JobId
+    public System.Guid TaskId
     {
       get
@@ -716 +716 @@
             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
           }
-          this.OnJobIdChanging(value);
+          this.OnTaskIdChanging(value);
           this.SendPropertyChanging();
           this._JobId = value;
-          this.SendPropertyChanged("JobId");
-          this.OnJobIdChanged();
+          this.SendPropertyChanged("TaskId");
+          this.OnTaskIdChanged();
         }
       }
@@ -783 +783 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_RequiredPlugin", Storage="_Job", ThisKey="JobId", OtherKey="JobId", IsForeignKey=true)]
-    public Job Job
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_RequiredPlugin", Storage="_Job", ThisKey="TaskId", OtherKey="TaskId", IsForeignKey=true)]
+    public Task Task
     {
       get
@@ -792 +792 @@
       set
       {
-        Job previousValue = this._Job.Entity;
+        Task previousValue = this._Job.Entity;
         if (((previousValue != value) 
               || (this._Job.HasLoadedOrAssignedValue == false)))
@@ -806 +806 @@
           {
             value.RequiredPlugins.Add(this);
-            this._JobId = value.JobId;
+            this._JobId = value.TaskId;
           }
           else
@@ -812 +812 @@
             this._JobId = default(System.Guid);
           }
-          this.SendPropertyChanged("Job");
+          this.SendPropertyChanged("Task");
         }
       }
@@ -1446 +1446 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Job")]
-  public partial class Job : INotifyPropertyChanging, INotifyPropertyChanged
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Task")]
+  public partial class Task : INotifyPropertyChanging, INotifyPropertyChanged
   {
     
@@ -1454 +1454 @@
     private System.Guid _JobId;
     
-    private global::HeuristicLab.Services.Hive.DataAccess.JobState _State;
+    private global::HeuristicLab.Services.Hive.DataAccess.TaskState _State;
     
     private double _ExecutionTime;
@@ -1482 +1482 @@
     private EntitySet<RequiredPlugin> _RequiredPlugins;
     
-    private EntitySet<Job> _Jobs;
-    
-    private EntityRef<JobData> _JobData;
+    private EntitySet<Task> _Jobs;
+    
+    private EntityRef<TaskData> _JobData;
     
     private EntitySet<StateLog> _StateLogs;
     
-    private EntityRef<Job> _Job1;
+    private EntityRef<Task> _Job1;
     
     private EntityRef<HiveExperiment> _HiveExperiment;
@@ -1496 +1496 @@
     partial void OnValidate(System.Data.Linq.ChangeAction action);
     partial void OnCreated();
-    partial void OnJobIdChanging(System.Guid value);
-    partial void OnJobIdChanged();
-    partial void OnStateChanging(global::HeuristicLab.Services.Hive.DataAccess.JobState value);
+    partial void OnTaskIdChanging(System.Guid value);
+    partial void OnTaskIdChanged();
+    partial void OnStateChanging(global::HeuristicLab.Services.Hive.DataAccess.TaskState value);
     partial void OnStateChanged();
     partial void OnExecutionTimeMsChanging(double value);
@@ -1504 +1504 @@
     partial void OnLastHeartbeatChanging(System.Nullable<System.DateTime> value);
     partial void OnLastHeartbeatChanged();
-    partial void OnParentJobIdChanging(System.Nullable<System.Guid> value);
-    partial void OnParentJobIdChanged();
+    partial void OnParentTaskIdChanging(System.Nullable<System.Guid> value);
+    partial void OnParentTaskIdChanged();
     partial void OnPriorityChanging(int value);
     partial void OnPriorityChanged();
@@ -1512 +1512 @@
     partial void OnMemoryNeededChanging(int value);
     partial void OnMemoryNeededChanged();
-    partial void OnIsParentJobChanging(bool value);
-    partial void OnIsParentJobChanged();
+    partial void OnIsParentTaskChanging(bool value);
+    partial void OnIsParentTaskChanged();
     partial void OnFinishWhenChildJobsFinishedChanging(bool value);
     partial void OnFinishWhenChildJobsFinishedChanged();
@@ -1524 +1524 @@
     #endregion
     
-    public Job()
+    public Task()
     {
       this._AssignedResources = new EntitySet<AssignedResource>(new Action<AssignedResource>(this.attach_AssignedResources), new Action<AssignedResource>(this.detach_AssignedResources));
       this._RequiredPlugins = new EntitySet<RequiredPlugin>(new Action<RequiredPlugin>(this.attach_RequiredPlugins), new Action<RequiredPlugin>(this.detach_RequiredPlugins));
-      this._Jobs = new EntitySet<Job>(new Action<Job>(this.attach_Jobs), new Action<Job>(this.detach_Jobs));
-      this._JobData = default(EntityRef<JobData>);
+      this._Jobs = new EntitySet<Task>(new Action<Task>(this.attach_Jobs), new Action<Task>(this.detach_Jobs));
+      this._JobData = default(EntityRef<TaskData>);
       this._StateLogs = new EntitySet<StateLog>(new Action<StateLog>(this.attach_StateLogs), new Action<StateLog>(this.detach_StateLogs));
-      this._Job1 = default(EntityRef<Job>);
+      this._Job1 = default(EntityRef<Task>);
       this._HiveExperiment = default(EntityRef<HiveExperiment>);
       OnCreated();
@@ -1537 +1537 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
-    public System.Guid JobId
+    public System.Guid TaskId
     {
       get
@@ -1547 +1547 @@
         if ((this._JobId != value))
         {
-          this.OnJobIdChanging(value);
+          this.OnTaskIdChanging(value);
           this.SendPropertyChanging();
           this._JobId = value;
-          this.SendPropertyChanged("JobId");
-          this.OnJobIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="JobState", Storage="_State", DbType="VarChar(30)", CanBeNull=false)]
-    public global::HeuristicLab.Services.Hive.DataAccess.JobState State
+          this.SendPropertyChanged("TaskId");
+          this.OnTaskIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="TaskState", Storage="_State", DbType="VarChar(30)", CanBeNull=false)]
+    public global::HeuristicLab.Services.Hive.DataAccess.TaskState State
     {
       get
@@ -1617 +1617 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentJobId", DbType="UniqueIdentifier")]
-    public System.Nullable<System.Guid> ParentJobId
+    public System.Nullable<System.Guid> ParentTaskId
     {
       get
@@ -1631 +1631 @@
             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
           }
-          this.OnParentJobIdChanging(value);
+          this.OnParentTaskIdChanging(value);
           this.SendPropertyChanging();
           this._ParentJobId = value;
-          this.SendPropertyChanged("ParentJobId");
-          this.OnParentJobIdChanged();
+          this.SendPropertyChanged("ParentTaskId");
+          this.OnParentTaskIdChanged();
         }
       }
@@ -1701 +1701 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsParentJob", DbType="Bit")]
-    public bool IsParentJob
+    public bool IsParentTask
     {
       get
@@ -1711 +1711 @@
         if ((this._IsParentJob != value))
         {
-          this.OnIsParentJobChanging(value);
+          this.OnIsParentTaskChanging(value);
           this.SendPropertyChanging();
           this._IsParentJob = value;
-          this.SendPropertyChanged("IsParentJob");
-          this.OnIsParentJobChanged();
+          this.SendPropertyChanged("IsParentTask");
+          this.OnIsParentTaskChanged();
         }
       }
@@ -1804 +1804 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_AssignedResource", Storage="_AssignedResources", ThisKey="JobId", OtherKey="JobId")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_AssignedResource", Storage="_AssignedResources", ThisKey="TaskId", OtherKey="TaskId")]
     public EntitySet<AssignedResource> AssignedResources
     {
@@ -1817 +1817 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_RequiredPlugin", Storage="_RequiredPlugins", ThisKey="JobId", OtherKey="JobId")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_RequiredPlugin", Storage="_RequiredPlugins", ThisKey="TaskId", OtherKey="TaskId")]
     public EntitySet<RequiredPlugin> RequiredPlugins
     {
@@ -1830 +1830 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_Job", Storage="_Jobs", ThisKey="JobId", OtherKey="ParentJobId")]
-    public EntitySet<Job> ChildJobs
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_Task", Storage="_Jobs", ThisKey="TaskId", OtherKey="ParentTaskId")]
+    public EntitySet<Task> ChildJobs
     {
       get
@@ -1843 +1843 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_JobData", Storage="_JobData", ThisKey="JobId", OtherKey="JobId", IsUnique=true, IsForeignKey=false)]
-    public JobData JobData
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_TaskData", Storage="_JobData", ThisKey="TaskId", OtherKey="TaskId", IsUnique=true, IsForeignKey=false)]
+    public TaskData JobData
     {
       get
@@ -1852 +1852 @@
       set
       {
-        JobData previousValue = this._JobData.Entity;
+        TaskData previousValue = this._JobData.Entity;
         if (((previousValue != value) 
               || (this._JobData.HasLoadedOrAssignedValue == false)))
@@ -1860 +1860 @@
           {
             this._JobData.Entity = null;
-            previousValue.Job = null;
+            previousValue.Task = null;
           }
           this._JobData.Entity = value;
           if ((value != null))
           {
-            value.Job = this;
+            value.Task = this;
           }
           this.SendPropertyChanged("JobData");
@@ -1872 +1872 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_StateLog", Storage="_StateLogs", ThisKey="JobId", OtherKey="JobId")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_StateLog", Storage="_StateLogs", ThisKey="TaskId", OtherKey="TaskId")]
     public EntitySet<StateLog> StateLogs
     {
@@ -1885 +1885 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_Job", Storage="_Job1", ThisKey="ParentJobId", OtherKey="JobId", IsForeignKey=true)]
-    public Job ParentJob
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_Task", Storage="_Job1", ThisKey="ParentTaskId", OtherKey="TaskId", IsForeignKey=true)]
+    public Task ParentJob
     {
       get
@@ -1894 +1894 @@
       set
       {
-        Job previousValue = this._Job1.Entity;
+        Task previousValue = this._Job1.Entity;
         if (((previousValue != value) 
               || (this._Job1.HasLoadedOrAssignedValue == false)))
@@ -1908 +1908 @@
           {
             value.ChildJobs.Add(this);
-            this._ParentJobId = value.JobId;
+            this._ParentJobId = value.TaskId;
           }
           else
@@ -1919 +1919 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Job", Storage="_HiveExperiment", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId", IsForeignKey=true)]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Task", Storage="_HiveExperiment", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId", IsForeignKey=true)]
     public HiveExperiment HiveExperiment
     {
@@ -1936 +1936 @@
           {
             this._HiveExperiment.Entity = null;
-            previousValue.Jobs.Remove(this);
+            previousValue.Tasks.Remove(this);
           }
           this._HiveExperiment.Entity = value;
           if ((value != null))
           {
-            value.Jobs.Add(this);
+            value.Tasks.Add(this);
             this._HiveExperimentId = value.HiveExperimentId;
           }
@@ -1976 +1976 @@
     {
       this.SendPropertyChanging();
-      entity.Job = this;
+      entity.Task = this;
     }
     
@@ -1982 +1982 @@
     {
       this.SendPropertyChanging();
-      entity.Job = null;
+      entity.Task = null;
     }
     
@@ -1988 +1988 @@
     {
       this.SendPropertyChanging();
-      entity.Job = this;
+      entity.Task = this;
     }
     
@@ -1994 +1994 @@
     {
       this.SendPropertyChanging();
-      entity.Job = null;
-    }
-    
-    private void attach_Jobs(Job entity)
+      entity.Task = null;
+    }
+    
+    private void attach_Jobs(Task entity)
     {
       this.SendPropertyChanging();
@@ -2003 +2003 @@
     }
     
-    private void detach_Jobs(Job entity)
+    private void detach_Jobs(Task entity)
     {
       this.SendPropertyChanging();
@@ -2012 +2012 @@
     {
       this.SendPropertyChanging();
-      entity.Job = this;
+      entity.Task = this;
     }
     
@@ -2018 +2018 @@
     {
       this.SendPropertyChanging();
-      entity.Job = null;
+      entity.Task = null;
     }
   }
@@ -2291 +2291 @@
     private bool _IsHiveEngine;
     
-    private EntitySet<Job> _Jobs;
+    private EntitySet<Task> _Jobs;
     
     private EntitySet<HiveExperimentPermission> _HiveExperimentPermissions;
@@ -2319 +2319 @@
     public HiveExperiment()
     {
-      this._Jobs = new EntitySet<Job>(new Action<Job>(this.attach_Jobs), new Action<Job>(this.detach_Jobs));
+      this._Jobs = new EntitySet<Task>(new Action<Task>(this.attach_Jobs), new Action<Task>(this.detach_Jobs));
       this._HiveExperimentPermissions = new EntitySet<HiveExperimentPermission>(new Action<HiveExperimentPermission>(this.attach_HiveExperimentPermissions), new Action<HiveExperimentPermission>(this.detach_HiveExperimentPermissions));
       OnCreated();
@@ -2484 +2484 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Job", Storage="_Jobs", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId")]
-    public EntitySet<Job> Jobs
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Task", Storage="_Jobs", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId")]
+    public EntitySet<Task> Tasks
     {
       get
@@ -2530 +2530 @@
     }
     
-    private void attach_Jobs(Job entity)
+    private void attach_Jobs(Task entity)
     {
       this.SendPropertyChanging();
@@ -2536 +2536 @@
     }
     
-    private void detach_Jobs(Job entity)
+    private void detach_Jobs(Task entity)
     {
       this.SendPropertyChanging();
@@ -2555 +2555 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JobData")]
-  public partial class JobData : INotifyPropertyChanging, INotifyPropertyChanged
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TaskData")]
+  public partial class TaskData : INotifyPropertyChanging, INotifyPropertyChanged
   {
     
@@ -2567 +2567 @@
     private System.DateTime _LastUpdate;
     
-    private EntityRef<Job> _Job;
+    private EntityRef<Task> _Job;
     
     #region Extensibility Method Definitions
@@ -2573 +2573 @@
     partial void OnValidate(System.Data.Linq.ChangeAction action);
     partial void OnCreated();
-    partial void OnJobIdChanging(System.Guid value);
-    partial void OnJobIdChanged();
+    partial void OnTaskIdChanging(System.Guid value);
+    partial void OnTaskIdChanged();
     partial void OnDataChanging(System.Data.Linq.Binary value);
     partial void OnDataChanged();
@@ -2581 +2581 @@
     #endregion
     
-    public JobData()
-    {
-      this._Job = default(EntityRef<Job>);
+    public TaskData()
+    {
+      this._Job = default(EntityRef<Task>);
       OnCreated();
     }
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid JobId
+    public System.Guid TaskId
     {
       get
@@ -2602 +2602 @@
             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
           }
-          this.OnJobIdChanging(value);
+          this.OnTaskIdChanging(value);
           this.SendPropertyChanging();
           this._JobId = value;
-          this.SendPropertyChanged("JobId");
-          this.OnJobIdChanged();
+          this.SendPropertyChanged("TaskId");
+          this.OnTaskIdChanged();
         }
       }
@@ -2651 +2651 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_JobData", Storage="_Job", ThisKey="JobId", OtherKey="JobId", IsForeignKey=true)]
-    public Job Job
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_TaskData", Storage="_Job", ThisKey="TaskId", OtherKey="TaskId", IsForeignKey=true)]
+    public Task Task
     {
       get
@@ -2660 +2660 @@
       set
       {
-        Job previousValue = this._Job.Entity;
+        Task previousValue = this._Job.Entity;
         if (((previousValue != value) 
               || (this._Job.HasLoadedOrAssignedValue == false)))
@@ -2674 +2674 @@
           {
             value.JobData = this;
-            this._JobId = value.JobId;
+            this._JobId = value.TaskId;
           }
           else
@@ -2680 +2680 @@
             this._JobId = default(System.Guid);
           }
-          this.SendPropertyChanged("Job");
+          this.SendPropertyChanged("Task");
         }
       }
@@ -2889 +2889 @@
     private System.Guid _StateLogId;
     
-    private global::HeuristicLab.Services.Hive.DataAccess.JobState _State;
+    private global::HeuristicLab.Services.Hive.DataAccess.TaskState _State;
     
     private System.DateTime _DateTime;
@@ -2901 +2901 @@
     private string _Exception;
     
-    private EntityRef<Job> _Job;
+    private EntityRef<Task> _Job;
     
     private EntityRef<Resource> _Resource;
@@ -2911 +2911 @@
     partial void OnStateLogIdChanging(System.Guid value);
     partial void OnStateLogIdChanged();
-    partial void OnStateChanging(global::HeuristicLab.Services.Hive.DataAccess.JobState value);
+    partial void OnStateChanging(global::HeuristicLab.Services.Hive.DataAccess.TaskState value);
     partial void OnStateChanged();
     partial void OnDateTimeChanging(System.DateTime value);
     partial void OnDateTimeChanged();
-    partial void OnJobIdChanging(System.Guid value);
-    partial void OnJobIdChanged();
+    partial void OnTaskIdChanging(System.Guid value);
+    partial void OnTaskIdChanged();
     partial void OnUserIdChanging(System.Nullable<System.Guid> value);
     partial void OnUserIdChanged();
@@ -2927 +2927 @@
     public StateLog()
     {
-      this._Job = default(EntityRef<Job>);
+      this._Job = default(EntityRef<Task>);
       this._Resource = default(EntityRef<Resource>);
       OnCreated();
@@ -2953 +2953 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="VarChar(30) NOT NULL", CanBeNull=false)]
-    public global::HeuristicLab.Services.Hive.DataAccess.JobState State
+    public global::HeuristicLab.Services.Hive.DataAccess.TaskState State
     {
       get
@@ -2993 +2993 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", DbType="UniqueIdentifier NOT NULL")]
-    public System.Guid JobId
+    public System.Guid TaskId
     {
       get
@@ -3007 +3007 @@
             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
           }
-          this.OnJobIdChanging(value);
+          this.OnTaskIdChanging(value);
           this.SendPropertyChanging();
           this._JobId = value;
-          this.SendPropertyChanged("JobId");
-          this.OnJobIdChanged();
+          this.SendPropertyChanged("TaskId");
+          this.OnTaskIdChanged();
         }
       }
@@ -3080 +3080 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_StateLog", Storage="_Job", ThisKey="JobId", OtherKey="JobId", IsForeignKey=true)]
-    public Job Job
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Task_StateLog", Storage="_Job", ThisKey="TaskId", OtherKey="TaskId", IsForeignKey=true)]
+    public Task Task
     {
       get
@@ -3089 +3089 @@
       set
       {
-        Job previousValue = this._Job.Entity;
+        Task previousValue = this._Job.Entity;
         if (((previousValue != value) 
               || (this._Job.HasLoadedOrAssignedValue == false)))
@@ -3103 +3103 @@
           {
             value.StateLogs.Add(this);
-            this._JobId = value.JobId;
+            this._JobId = value.TaskId;
           }
           else
@@ -3109 +3109 @@
             this._JobId = default(System.Guid);
           }
-          this.SendPropertyChanged("Job");
+          this.SendPropertyChanged("Task");
         }
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql

@@ -5 +5 @@
 CREATE TABLE [dbo].[AssignedResources](
   [ResourceId] UniqueIdentifier NOT NULL, 
-  [JobId] UniqueIdentifier NOT NULL,   
-  CONSTRAINT [PK_dbo.ResourceIdJobId] PRIMARY KEY ([ResourceId], [JobId])
+  [TaskId] UniqueIdentifier NOT NULL,   
+  CONSTRAINT [PK_dbo.ResourceIdTaskId] PRIMARY KEY ([ResourceId], [TaskId])
   )
 CREATE TABLE [dbo].[Plugin](
@@ -19 +19 @@
 CREATE TABLE [dbo].[RequiredPlugins](
   [RequiredPluginId] UniqueIdentifier NOT NULL, 
-  [JobId] UniqueIdentifier NOT NULL, 
+  [TaskId] UniqueIdentifier NOT NULL, 
   [PluginId] UniqueIdentifier NOT NULL, 
   CONSTRAINT [PK_dbo.RequiredPlugins] PRIMARY KEY ([RequiredPluginId])
@@ -42 +42 @@
   CONSTRAINT [PK_dbo.Resource] PRIMARY KEY ([ResourceId])
   )
-CREATE TABLE [dbo].[Job](
-  [JobId] UniqueIdentifier NOT NULL, 
-  [JobState] VarChar(30), 
+CREATE TABLE [dbo].[Task](
+  [TaskId] UniqueIdentifier NOT NULL, 
+  [TaskState] VarChar(30), 
   [ExecutionTimeMs] float, 
   [LastHeartbeat] DateTime, 
-  [ParentJobId] UniqueIdentifier, 
+  [ParentTaskId] UniqueIdentifier, 
   [Priority] Int NOT NULL, 
   [CoresNeeded] Int NOT NULL, 
   [MemoryNeeded] Int NOT NULL, 
-  [IsParentJob] Bit, 
+  [IsParentTask] Bit, 
   [FinishWhenChildJobsFinished] Bit, 
   [Command] VarChar(30), 
   [HiveExperimentId] UniqueIdentifier NOT NULL, 
   [IsPrivileged] Bit, 
-  CONSTRAINT [PK_dbo.Job] PRIMARY KEY ([JobId])
+  CONSTRAINT [PK_dbo.Task] PRIMARY KEY ([TaskId])
   )
 CREATE TABLE [dbo].[Downtime](
@@ -79 +79 @@
   CONSTRAINT [PK_dbo.HiveExperiment] PRIMARY KEY ([HiveExperimentId])
   )
-CREATE TABLE [dbo].[JobData](
-  [JobId] UniqueIdentifier NOT NULL, 
+CREATE TABLE [dbo].[TaskData](
+  [TaskId] UniqueIdentifier NOT NULL, 
   [Data] VarBinary(MAX), 
   [LastUpdate] DateTime, 
-  CONSTRAINT [PK_dbo.JobData] PRIMARY KEY ([JobId])
+  CONSTRAINT [PK_dbo.TaskData] PRIMARY KEY ([TaskId])
   )
 CREATE TABLE [dbo].[PluginData](
@@ -96 +96 @@
   [State] VarChar(30) NOT NULL, 
   [DateTime] DateTime NOT NULL, 
-  [JobId] UniqueIdentifier NOT NULL, 
+  [TaskId] UniqueIdentifier NOT NULL, 
   [UserId] UniqueIdentifier, 
   [SlaveId] UniqueIdentifier, 
@@ -149 +149 @@
   ADD CONSTRAINT [Resource_AssignedResource] FOREIGN KEY ([ResourceId]) REFERENCES [dbo].[Resource]([ResourceId])
 ALTER TABLE [dbo].[AssignedResources]
-  ADD CONSTRAINT [Job_AssignedResource] FOREIGN KEY ([JobId]) REFERENCES [dbo].[Job]([JobId])
+  ADD CONSTRAINT [Task_AssignedResource] FOREIGN KEY ([TaskId]) REFERENCES [dbo].[Task]([TaskId])
 ALTER TABLE [dbo].[RequiredPlugins]
   ADD CONSTRAINT [Plugin_RequiredPlugin] FOREIGN KEY ([PluginId]) REFERENCES [dbo].[Plugin]([PluginId])
 ALTER TABLE [dbo].[RequiredPlugins]
-  ADD CONSTRAINT [Job_RequiredPlugin] FOREIGN KEY ([JobId]) REFERENCES [dbo].[Job]([JobId])
+  ADD CONSTRAINT [Task_RequiredPlugin] FOREIGN KEY ([TaskId]) REFERENCES [dbo].[Task]([TaskId])
 ALTER TABLE [dbo].[Resource]
   ADD CONSTRAINT [Resource_Resource] FOREIGN KEY ([ParentResourceId]) REFERENCES [dbo].[Resource]([ResourceId])
-ALTER TABLE [dbo].[Job]
-  ADD CONSTRAINT [Job_Job] FOREIGN KEY ([ParentJobId]) REFERENCES [dbo].[Job]([JobId])
-ALTER TABLE [dbo].[Job]
+ALTER TABLE [dbo].[Task]
+  ADD CONSTRAINT [Task_Task] FOREIGN KEY ([ParentTaskId]) REFERENCES [dbo].[Task]([TaskId])
+ALTER TABLE [dbo].[Task]
   ADD CONSTRAINT [HiveExperiment_Job] FOREIGN KEY ([HiveExperimentId]) REFERENCES [dbo].[HiveExperiment]([HiveExperimentId])
 ALTER TABLE [dbo].[Downtime]
   ADD CONSTRAINT [Resource_Downtime] FOREIGN KEY ([ResourceId]) REFERENCES [dbo].[Resource]([ResourceId])
-ALTER TABLE [dbo].[JobData]
-  ADD CONSTRAINT [Job_JobData] FOREIGN KEY ([JobId]) REFERENCES [dbo].[Job]([JobId])
+ALTER TABLE [dbo].[TaskData]
+  ADD CONSTRAINT [Task_TaskData] FOREIGN KEY ([TaskId]) REFERENCES [dbo].[Task]([TaskId])
 ALTER TABLE [dbo].[PluginData]
   ADD CONSTRAINT [Plugin_PluginData] FOREIGN KEY ([PluginId]) REFERENCES [dbo].[Plugin]([PluginId])
 ALTER TABLE [dbo].[StateLog]
-  ADD CONSTRAINT [Job_StateLog] FOREIGN KEY ([JobId]) REFERENCES [dbo].[Job]([JobId])
+  ADD CONSTRAINT [Task_StateLog] FOREIGN KEY ([TaskId]) REFERENCES [dbo].[Task]([TaskId])
 ALTER TABLE [dbo].[StateLog]
   ADD CONSTRAINT [Resource_StateLog] FOREIGN KEY ([SlaveId]) REFERENCES [dbo].[Resource]([ResourceId])

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql

@@ -8 +8 @@
 
 
-ALTER TABLE [dbo].[AssignedResources]  DROP  CONSTRAINT [Job_AssignedResource]
-ALTER TABLE [dbo].[AssignedResources]  WITH CHECK ADD  CONSTRAINT [Job_AssignedResource] FOREIGN KEY([JobId])
-REFERENCES [dbo].[Job] ([JobId])
+ALTER TABLE [dbo].[AssignedResources]  DROP  CONSTRAINT [Task_AssignedResource]
+ALTER TABLE [dbo].[AssignedResources]  WITH CHECK ADD  CONSTRAINT [Task_AssignedResource] FOREIGN KEY([TaskId])
+REFERENCES [dbo].[Task] ([TaskId])
 ON UPDATE CASCADE
 ON DELETE CASCADE
@@ -21 +21 @@
 GO
 
-ALTER TABLE dbo.Job ALTER COLUMN JobId ADD ROWGUIDCOL;
-ALTER TABLE dbo.Job WITH NOCHECK ADD CONSTRAINT [DF_Job_JobId] DEFAULT (NEWSEQUENTIALID()) FOR JobId;
-GO
-
-ALTER TABLE [dbo].[StateLog]  DROP  CONSTRAINT [Job_StateLog]
-ALTER TABLE [dbo].[StateLog]  WITH CHECK ADD CONSTRAINT [Job_StateLog] FOREIGN KEY([JobId])
-REFERENCES [dbo].[Job] ([JobId])
+ALTER TABLE dbo.Task ALTER COLUMN TaskId ADD ROWGUIDCOL;
+ALTER TABLE dbo.Task WITH NOCHECK ADD CONSTRAINT [DF_Task_TaskId] DEFAULT (NEWSEQUENTIALID()) FOR TaskId;
+GO
+
+ALTER TABLE [dbo].[StateLog]  DROP  CONSTRAINT [Task_StateLog]
+ALTER TABLE [dbo].[StateLog]  WITH CHECK ADD CONSTRAINT [Task_StateLog] FOREIGN KEY([TaskId])
+REFERENCES [dbo].[Task] ([TaskId])
 ON UPDATE CASCADE
 ON DELETE CASCADE
@@ -54 +54 @@
 ALTER TABLE dbo.RequiredPlugins WITH NOCHECK ADD CONSTRAINT [DF_RequiredPlugins_RequiredPluginId] DEFAULT (NEWSEQUENTIALID()) FOR RequiredPluginId;
 
-ALTER TABLE [dbo].[RequiredPlugins]  DROP  CONSTRAINT [Job_RequiredPlugin]
-ALTER TABLE [dbo].[RequiredPlugins]  WITH CHECK ADD  CONSTRAINT [Job_RequiredPlugin] FOREIGN KEY([JobId])
-REFERENCES [dbo].[Job] ([JobId])
+ALTER TABLE [dbo].[RequiredPlugins]  DROP  CONSTRAINT [Task_RequiredPlugin]
+ALTER TABLE [dbo].[RequiredPlugins]  WITH CHECK ADD  CONSTRAINT [Task_RequiredPlugin] FOREIGN KEY([TaskId])
+REFERENCES [dbo].[Task] ([TaskId])
 ON UPDATE CASCADE
 ON DELETE CASCADE
@@ -110 +110 @@
 
 /* create indices */
-CREATE INDEX Index_RequiredPlugins_JobId ON RequiredPlugins(JobId);
+CREATE INDEX Index_RequiredPlugins_TaskId ON RequiredPlugins(TaskId);
 GO
 
@@ -120 +120 @@
 CREATE VIEW [dbo].[view_FirstState]
 AS
-SELECT     sl.JobId, sl.DateTime, sl.State
+SELECT     sl.TaskId, sl.DateTime, sl.State
 FROM         dbo.StateLog AS sl INNER JOIN
-                          (SELECT     JobId, MIN(DateTime) AS DateTime
+                          (SELECT     TaskId, MIN(DateTime) AS DateTime
                             FROM          dbo.StateLog
-                            GROUP BY JobId) AS minDate ON sl.DateTime = minDate.DateTime AND sl.JobId = minDate.JobId
+                            GROUP BY TaskId) AS minDate ON sl.DateTime = minDate.DateTime AND sl.TaskId = minDate.TaskId
 
 GO
@@ -134 +134 @@
 CREATE VIEW [dbo].[view_LastState]
 AS
-SELECT     sl.JobId, sl.DateTime, sl.State
+SELECT     sl.TaskId, sl.DateTime, sl.State
 FROM         dbo.StateLog AS sl INNER JOIN
-                          (SELECT     JobId, MAX(DateTime) AS DateTime
+                          (SELECT     TaskId, MAX(DateTime) AS DateTime
                             FROM          dbo.StateLog
-                            GROUP BY JobId) AS minDate ON sl.DateTime = minDate.DateTime AND sl.JobId = minDate.JobId
+                            GROUP BY TaskId) AS minDate ON sl.DateTime = minDate.DateTime AND sl.TaskId = minDate.TaskId
 GO
 
@@ -176 +176 @@
 CREATE TRIGGER [dbo].[tr_HiveExperimentDeleteCascade] ON [dbo].[HiveExperiment] INSTEAD OF DELETE AS 
 BEGIN
-  DELETE Job FROM deleted, Job WHERE deleted.HiveExperimentId = Job.HiveExperimentId
+  DELETE Task FROM deleted, Task WHERE deleted.HiveExperimentId = Task.HiveExperimentId
   DELETE HiveExperiment FROM deleted, HiveExperiment WHERE deleted.HiveExperimentId = HiveExperiment.HiveExperimentId
 END
@@ -186 +186 @@
 -- Description: Recursively deletes all child-jobs of a job when it is deleted. (Source: http://devio.wordpress.com/2008/05/23/recursive-delete-in-sql-server/)
 -- =============================================
-CREATE TRIGGER [dbo].[tr_JobDeleteCascade] ON [dbo].[Job] INSTEAD OF DELETE AS 
+CREATE TRIGGER [dbo].[tr_JobDeleteCascade] ON [dbo].[Task] INSTEAD OF DELETE AS 
 BEGIN
   -- add statistics
@@ -202 +202 @@
   WHERE 
     he.HiveExperimentId = j.HiveExperimentId AND 
-    fs.JobId = j.JobId AND 
-    ls.JobId = j.JobId
+    fs.TaskId = j.TaskId AND 
+    ls.TaskId = j.TaskId
   GROUP BY he.OwnerUserId
 
   -- recursively delete jobs
   CREATE TABLE #Table( 
-    JobId uniqueidentifier 
+    TaskId uniqueidentifier 
   )
-  INSERT INTO #Table (JobId)
-  SELECT JobId FROM deleted
+  INSERT INTO #Table (TaskId)
+  SELECT TaskId FROM deleted
   
   DECLARE @c INT
   SET @c = 0
   
-  WHILE @c <> (SELECT COUNT(JobId) FROM #Table) BEGIN
-    SELECT @c = COUNT(JobId) FROM #Table
+  WHILE @c <> (SELECT COUNT(TaskId) FROM #Table) BEGIN
+    SELECT @c = COUNT(TaskId) FROM #Table
     
-    INSERT INTO #Table (JobId)
-      SELECT Job.JobId
-      FROM Job
-      LEFT OUTER JOIN #Table ON Job.JobId = #Table.JobId
-      WHERE Job.ParentJobId IN (SELECT JobId FROM #Table)
-        AND #Table.JobId IS NULL
+    INSERT INTO #Table (TaskId)
+      SELECT Task.TaskId
+      FROM Task
+      LEFT OUTER JOIN #Table ON Task.TaskId = #Table.TaskId
+      WHERE Task.ParentTaskId IN (SELECT TaskId FROM #Table)
+        AND #Table.TaskId IS NULL
   END
   
-  DELETE JobData FROM JobData INNER JOIN #Table ON JobData.JobId = #Table.JobId
-  DELETE Job FROM Job INNER JOIN #Table ON Job.JobId = #Table.JobId
+  DELETE TaskData FROM TaskData INNER JOIN #Table ON TaskData.TaskId = #Table.TaskId
+  DELETE Task FROM Task INNER JOIN #Table ON Task.TaskId = #Table.TaskId
 END
 GO
@@ -235 +235 @@
 -- Author:    cneumuel
 -- Create date: 17.05.2011
--- Description: Writes the execution times of deleted jobs into DeletedJobStats to ensure correct statistics
--- =============================================
---CREATE TRIGGER [dbo].[tr_DeletedJobStats] ON [dbo].[Job] AFTER DELETE AS
+-- Description: Writes the execution times of deleted Tasks into DeletedJobStats to ensure correct statistics
+-- =============================================
+--CREATE TRIGGER [dbo].[tr_DeletedJobStats] ON [dbo].[Task] AFTER DELETE AS
 --BEGIN
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Query Jobs.sql

@@ -1 +1 @@
 /****** Script for SelectTopNRows command from SSMS  ******/
-SELECT j.[JobId]
-      ,j.[JobState]
+SELECT j.[TaskId]
+      ,j.[TaskState]
       ,j.[ExecutionTimeMs]/1000/60/60 AS ExecutionTimeHours
       ,DATALENGTH(jd.data)/1024.0/1024.0 AS MB
@@ -13 +13 @@
       ,j.[IsPrivileged]
       ,j.[Command]
-      ,j.[IsParentJob]   
+      ,j.[IsParentTask]   
       ,j.[FinishWhenChildJobsFinished]
-      ,j.[ParentJobId]
+      ,j.[ParentTaskId]
       , he.HiveExperimentId
   FROM 
-  [HeuristicLab.Hive-3.3].[dbo].[Job] j
+  [HeuristicLab.Hive-3.3].[dbo].[Task] j
   ,[HeuristicLab.Hive-3.3].[dbo].[HiveExperiment] he
   ,[HeuristicLab.Authentication].dbo.aspnet_Users u
-  ,[HeuristicLab.Hive-3.3].dbo.JobData jd
+  ,[HeuristicLab.Hive-3.3].dbo.TaskData jd
   WHERE
   j.HiveExperimentId = he.HiveExperimentId
-  AND j.JobId = jd.JobId
+  AND j.TaskId = jd.TaskId
   AND he.OwnerUserId = u.UserId
   --AND he.DateCreated > '06-03-2011 10:30'
   
-ORDER BY j.JobState, he.DateCreated DESC
+ORDER BY j.TaskState, he.DateCreated DESC