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

Timestamp:

02/21/11 17:35:42 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed handling of StateLog in DataLayer
• extended unit tests
• changed style of service calls to OKB-like style (using delegates)
• added possibility that parent jobs can be finished immediately when child jobs are finished

Location:

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

Files:

• Convert.cs (modified) (2 diffs)
• HiveDao.cs (modified) (4 diffs)
• HiveDataContext.dbml (modified) (1 diff)
• HiveDataContext.dbml.layout (modified) (4 diffs)
• HiveDataContext.designer.cs (modified) (7 diffs)
• Interfaces/IHiveDao.cs (modified) (2 diffs)

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

@@ -40 +40 @@
         LastHeartbeat = source.LastHeartbeat,
         State = source.State,
-        StateLog = source.StateLogs.Select(x => Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList()
+        StateLog = source.StateLogs.Select(x => Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList(),
+        IsParentJob = source.IsParentJob,
+        FinishWhenChildJobsFinished = source.FinishWhenChildJobsFinished
       };
     }
@@ -59 +61 @@
         target.State = source.State;
         if (target.StateLogs == null) target.StateLogs = new EntitySet<StateLog>();
-        target.StateLogs.AddRange(source.StateLog.Select(x => Convert.ToEntity(x)).OrderBy(x => x.DateTime));
+        foreach (DT.StateLog sl in source.StateLog.Where(x => x.Id == Guid.Empty)) {
+          target.StateLogs.Add(Convert.ToEntity(sl));
+        }
+        
+        //target.StateLogs.AddRange(source.StateLog.Select(x => Convert.ToEntity(x)).OrderBy(x => x.DateTime));
+        target.IsParentJob = source.IsParentJob;
+        target.FinishWhenChildJobsFinished = source.FinishWhenChildJobsFinished;
         // RequiredPlugins are added by Dao
       }

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

@@ -82 +82 @@
     }
 
-    public IEnumerable<DT.Job> GetWaitingParentJobs(IEnumerable<Guid> resourceIds, int count) {
+    /// <summary>
+    /// returns all parent jobs which are waiting for their child jobs to finish
+    /// </summary>
+    /// <param name="resourceIds">list of resourceids which for which the jobs should be valid</param>
+    /// <param name="count">maximum number of jobs to return</param>
+    /// <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) {
       using (var db = CreateContext()) {
         var query = from ar in db.AssignedResources
-                    join sl in db.StateLogs on ar.JobId equals sl.JobId
                     where resourceIds.Contains(ar.ResourceId)
-                       && ar.Job.State == JobState.FinishOnChildJobsFinished
+                       && 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
@@ -103 +111 @@
       using (var db = CreateContext()) {
         var resourceIds = GetParentResources(slave.Id).Select(r => r.Id);
-        var waitingParentJobs = GetWaitingParentJobs(resourceIds, count);
+        var waitingParentJobs = GetParentJobs(resourceIds, count, false);
         if (count > 0 && waitingParentJobs.Count() >= count) return waitingParentJobs.Take(count).ToArray();
 
         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
@@ -160 +169 @@
     #endregion
 
+    #region StateLog Methods
+
+    public DT.StateLog GetStateLog(Guid id) {
+      using (var db = CreateContext()) {
+        return Convert.ToDto(db.StateLogs.SingleOrDefault(x => x.StateLogId == id));
+      }
+    }
+
+    public IEnumerable<DT.StateLog> GetStateLogs(Expression<Func<StateLog, bool>> predicate) {
+      using (var db = CreateContext()) {
+        return db.StateLogs.Where(predicate).Select(x => Convert.ToDto(x)).ToArray();
+      }
+    }
+
+    public Guid AddStateLog(DT.StateLog dto) {
+      using (var db = CreateContext()) {
+        var entity = Convert.ToEntity(dto);
+        db.StateLogs.InsertOnSubmit(entity);
+        db.SubmitChanges();
+        return entity.StateLogId;
+      }
+    }
+
+    public void UpdateStateLog(DT.StateLog dto) {
+      using (var db = CreateContext()) {
+        var entity = db.StateLogs.FirstOrDefault(x => x.StateLogId == dto.Id);
+        if (entity == null) db.StateLogs.InsertOnSubmit(Convert.ToEntity(dto));
+        else Convert.ToEntity(dto, entity);
+        db.SubmitChanges();
+      }
+    }
+
+    public void DeleteStateLog(Guid id) {
+      using (var db = CreateContext()) {
+        var entity = db.StateLogs.FirstOrDefault(x => x.StateLogId == id);
+        if (entity != null) db.StateLogs.DeleteOnSubmit(entity);
+        db.SubmitChanges();
+      }
+    }
+    #endregion
+
     #region HiveExperiment Methods
     public DT.HiveExperiment GetHiveExperiment(Guid id) {
@@ -507 +557 @@
 
     #endregion
+
   }
 }

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

@@ -60 +60 @@
     <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.Common.DataTransfer.JobState" DbType="VarChar(30)" CanBeNull="false" />
+      <Column Name="ExecutionTime" Type="System.String" DbType="VarChar(30)" CanBeNull="true" />
+      <Column Name="LastHeartbeat" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
       <Column Name="ParentJobId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Column Name="ExecutionTime" Type="System.String" DbType="VarChar(30)" 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="LastHeartbeat" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
-      <Column Name="JobState" Member="State" Type="global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState" DbType="VarChar(30)" CanBeNull="false" />
+      <Column Name="IsParentJob" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
+      <Column Name="FinishWhenChildJobsFinished" 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" />

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

@@ -27 +27 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="695bfc39-59f3-4e60-8644-f847964bf62c" absoluteBounds="6.5, 1, 2, 2.3478011067708335">
+    <classShape Id="695bfc39-59f3-4e60-8644-f847964bf62c" absoluteBounds="6.5, 1, 2, 2.7324039713541666">
       <DataClassMoniker Name="/HiveDataContext/Job" />
       <nestedChildShapes>
-        <elementListCompartment Id="a6a30e11-03d1-4869-82e6-b733f4ef9974" absoluteBounds="6.5150000000000006, 1.46, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="a6a30e11-03d1-4869-82e6-b733f4ef9974" absoluteBounds="6.5150000000000006, 1.46, 1.9700000000000002, 2.1724039713541665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -76 +76 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(8.5 : 3.34780110677083); (8.875 : 3.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(8.5 : 3.73240397135417); (8.875 : 3.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_AssignedResource" />
       <nodes>
@@ -83 +83 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(7.4687475 : 3.34780110677083); (7.4687475 : 5.5)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(7.4687475 : 3.73240397135417); (7.4687475 : 5.5)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_RequiredPlugin" />
       <nodes>
@@ -104 +104 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(6.5 : 2.98640055338542); (6.125 : 2.98640055338542)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(6.5 : 3.17870198567708); (6.125 : 3.17870198567708)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_HiveExperiment" />
       <nodes>

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

@@ -1393 +1393 @@
     private System.Guid _JobId;
     
+    private global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState _State;
+    
+    private string _ExecutionTime;
+    
+    private System.Nullable<System.DateTime> _LastHeartbeat;
+    
     private System.Nullable<System.Guid> _ParentJobId;
     
-    private string _ExecutionTime;
-    
     private int _Priority;
     
@@ -1403 +1407 @@
     private int _MemoryNeeded;
     
-    private System.Nullable<System.DateTime> _LastHeartbeat;
-    
-    private global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState _State;
+    private bool _IsParentJob;
+    
+    private bool _FinishWhenChildJobsFinished;
     
     private EntitySet<AssignedResource> _AssignedResources;
@@ -1425 +1429 @@
     partial void OnJobIdChanging(System.Guid value);
     partial void OnJobIdChanged();
+    partial void OnStateChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState value);
+    partial void OnStateChanged();
+    partial void OnExecutionTimeChanging(string value);
+    partial void OnExecutionTimeChanged();
+    partial void OnLastHeartbeatChanging(System.Nullable<System.DateTime> value);
+    partial void OnLastHeartbeatChanged();
     partial void OnParentJobIdChanging(System.Nullable<System.Guid> value);
     partial void OnParentJobIdChanged();
-    partial void OnExecutionTimeChanging(string value);
-    partial void OnExecutionTimeChanged();
     partial void OnPriorityChanging(int value);
     partial void OnPriorityChanged();
@@ -1435 +1443 @@
     partial void OnMemoryNeededChanging(int value);
     partial void OnMemoryNeededChanged();
-    partial void OnLastHeartbeatChanging(System.Nullable<System.DateTime> value);
-    partial void OnLastHeartbeatChanged();
-    partial void OnStateChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState value);
-    partial void OnStateChanged();
+    partial void OnIsParentJobChanging(bool value);
+    partial void OnIsParentJobChanged();
+    partial void OnFinishWhenChildJobsFinishedChanging(bool value);
+    partial void OnFinishWhenChildJobsFinishedChanged();
     #endregion
     
@@ -1472 +1480 @@
     }
     
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="JobState", Storage="_State", DbType="VarChar(30)", CanBeNull=false)]
+    public global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState State
+    {
+      get
+      {
+        return this._State;
+      }
+      set
+      {
+        if ((this._State != value))
+        {
+          this.OnStateChanging(value);
+          this.SendPropertyChanging();
+          this._State = value;
+          this.SendPropertyChanged("State");
+          this.OnStateChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExecutionTime", DbType="VarChar(30)")]
+    public string ExecutionTime
+    {
+      get
+      {
+        return this._ExecutionTime;
+      }
+      set
+      {
+        if ((this._ExecutionTime != value))
+        {
+          this.OnExecutionTimeChanging(value);
+          this.SendPropertyChanging();
+          this._ExecutionTime = value;
+          this.SendPropertyChanged("ExecutionTime");
+          this.OnExecutionTimeChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastHeartbeat", DbType="DateTime")]
+    public System.Nullable<System.DateTime> LastHeartbeat
+    {
+      get
+      {
+        return this._LastHeartbeat;
+      }
+      set
+      {
+        if ((this._LastHeartbeat != value))
+        {
+          this.OnLastHeartbeatChanging(value);
+          this.SendPropertyChanging();
+          this._LastHeartbeat = value;
+          this.SendPropertyChanged("LastHeartbeat");
+          this.OnLastHeartbeatChanged();
+        }
+      }
+    }
+    
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentJobId", DbType="UniqueIdentifier")]
     public System.Nullable<System.Guid> ParentJobId
@@ -1496 +1564 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExecutionTime", DbType="VarChar(30)")]
-    public string ExecutionTime
-    {
-      get
-      {
-        return this._ExecutionTime;
-      }
-      set
-      {
-        if ((this._ExecutionTime != value))
-        {
-          this.OnExecutionTimeChanging(value);
-          this.SendPropertyChanging();
-          this._ExecutionTime = value;
-          this.SendPropertyChanged("ExecutionTime");
-          this.OnExecutionTimeChanged();
-        }
-      }
-    }
-    
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Priority", DbType="Int NOT NULL")]
     public int Priority
@@ -1576 +1624 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastHeartbeat", DbType="DateTime")]
-    public System.Nullable<System.DateTime> LastHeartbeat
-    {
-      get
-      {
-        return this._LastHeartbeat;
-      }
-      set
-      {
-        if ((this._LastHeartbeat != value))
-        {
-          this.OnLastHeartbeatChanging(value);
-          this.SendPropertyChanging();
-          this._LastHeartbeat = value;
-          this.SendPropertyChanged("LastHeartbeat");
-          this.OnLastHeartbeatChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="JobState", Storage="_State", DbType="VarChar(30)", CanBeNull=false)]
-    public global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState State
-    {
-      get
-      {
-        return this._State;
-      }
-      set
-      {
-        if ((this._State != value))
-        {
-          this.OnStateChanging(value);
-          this.SendPropertyChanging();
-          this._State = value;
-          this.SendPropertyChanged("State");
-          this.OnStateChanged();
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsParentJob", DbType="Bit")]
+    public bool IsParentJob
+    {
+      get
+      {
+        return this._IsParentJob;
+      }
+      set
+      {
+        if ((this._IsParentJob != value))
+        {
+          this.OnIsParentJobChanging(value);
+          this.SendPropertyChanging();
+          this._IsParentJob = value;
+          this.SendPropertyChanged("IsParentJob");
+          this.OnIsParentJobChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FinishWhenChildJobsFinished", DbType="Bit")]
+    public bool FinishWhenChildJobsFinished
+    {
+      get
+      {
+        return this._FinishWhenChildJobsFinished;
+      }
+      set
+      {
+        if ((this._FinishWhenChildJobsFinished != value))
+        {
+          this.OnFinishWhenChildJobsFinishedChanging(value);
+          this.SendPropertyChanging();
+          this._FinishWhenChildJobsFinished = value;
+          this.SendPropertyChanged("FinishWhenChildJobsFinished");
+          this.OnFinishWhenChildJobsFinishedChanged();
         }
       }

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

@@ -15 +15 @@
     void DeleteJob(Guid id);
     IEnumerable<DT.Job> GetWaitingJobs(DT.Slave slave, int count);
+    IEnumerable<DT.Job> GetParentJobs(IEnumerable<Guid> resourceIds, int count, bool finished);
     #endregion
 
@@ -23 +24 @@
     void UpdateJobData(DT.JobData dto);
     void DeleteJobData(Guid id);
+    #endregion
+
+    #region StateLog Methods
+    DT.StateLog GetStateLog(Guid id);
+    IEnumerable<DT.StateLog> GetStateLogs(Expression<Func<StateLog, bool>> predicate);
+    Guid AddStateLog(DT.StateLog dto);
+    void UpdateStateLog(DT.StateLog dto);
+    void DeleteStateLog(Guid id);
     #endregion