Changeset 4649 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer

Timestamp:

10/28/10 14:52:56 (14 years ago)

Author:

cneumuel

Message:

• moved db-context into datalayer
• businesslayer only defines the transaction-scope
• removed contextfactory
• implemented convert-methods
• made naming in db and domainobjects more consistent
• changed wcf-service to be http-only (for now)

(#1233)

Location:

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer

Files:

• HiveExperiment.cs (modified) (2 diffs)
• HiveItem.cs (modified) (1 diff)
• HiveItemBase.cs (added)
• Job.cs (modified) (3 diffs)
• JobData.cs (modified) (1 diff)
• JobState.cs (modified) (4 diffs)
• LightweightJob.cs (modified) (3 diffs)
• Slave.cs (modified) (3 diffs)
• SlaveGroup.cs (modified) (1 diff)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveExperiment.cs

@@ -30 +30 @@
   public class HiveExperiment : NamedHiveItem {
     [DataMember]
-    public string ResourceIds { get; set; }
-    [DataMember]
     public Guid UserId { get; set; }
     [DataMember]
@@ -37 +35 @@
 
     public override string ToString() {
-      return base.ToString() + "Name: " + Name + ", Description: " + Description + ", ResourceIds: " + ResourceIds;
+      return base.ToString() + "Name: " + Name + ", Description: " + Description;
     }
     
     public override IDeepCloneable Clone(Cloner cloner) {
       var clone = (HiveExperiment)base.Clone(cloner);
-      clone.ResourceIds = this.ResourceIds;
       clone.RootJobId = this.RootJobId;
       clone.UserId = this.UserId;

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveItem.cs

@@ -8 +8 @@
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
   [DataContract]
-  public abstract class HiveItem : IDeepCloneable {
+  [Serializable]
+  public abstract class HiveItem : HiveItemBase {
     [DataMember]
     public Guid Id { get; set; }
 
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      HiveItem clone = (HiveItem)Activator.CreateInstance(this.GetType(), true);
-      cloner.RegisterClonedObject(this, clone);
+      HiveItem clone = (HiveItem)base.Clone(cloner);
       clone.Id = this.Id;
       return clone;
     }
-
-    public object Clone() {
-      return Clone(new Cloner());
-    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Job.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
-
   [DataContract]
   [Serializable]
@@ -40 +39 @@
     public int MemoryNeeded { get; set; }
     [DataMember]
-    public List<Guid> PluginsNeededIds { get; set; }
-    [DataMember]
-    public List<Guid> AssignedResourceIds { get; set; }
-    [DataMember]
-    public Guid ProjectId { get; set; }
+    public Guid? ProjectId { get; set; }
 
     public override string ToString() {
-      return base.ToString() + "State: " + State + ", [SlaveId : " + SlaveId + " ] , DateCreated: " + DateCreated + ", DateCalculated: " + DateCalculated +
-        "Priority: " + Priority + ", CoresNeeded: " + CoresNeeded + "AssignedResources: " + AssignedResourceIds;
+      return base.ToString() + "State: " + JobState + ", [SlaveId : " + SlaveId + " ] , DateCreated: " + DateCreated + ", DateCalculated: " + DateCalculated +
+        "Priority: " + Priority + ", CoresNeeded: " + CoresNeeded;
     }
 
     public Job() {
-      PluginsNeededIds = new List<Guid>();
-      AssignedResourceIds = new List<Guid>();
     }
 
@@ -62 +55 @@
       clone.CoresNeeded = this.CoresNeeded;
       clone.MemoryNeeded = this.MemoryNeeded;
-      clone.PluginsNeededIds = new List<Guid>(this.PluginsNeededIds);
-      clone.AssignedResourceIds = new List<Guid>(this.AssignedResourceIds);
       clone.ProjectId = this.ProjectId;
       return clone;

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/JobData.cs

@@ -28 +28 @@
   [DataContract]
   [Serializable]
-  public class JobData : HiveItem {
+  public class JobData : HiveItemBase {
     [DataMember]
     public Guid JobId { get; set; }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/JobState.cs

@@ -23 +23 @@
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
   public enum JobState {
-    /// <summary>
-    /// Job is actively calculated on a Slave
+        /// <summary>
+    /// A job is offline as long as he is not yet submitted to the hive
     /// </summary>
-    Calculating,
+    Offline,
 
     /// <summary>
@@ -33 +33 @@
     Waiting,
 
+        /// <summary>
+    /// The job is paused and waits on the server to be sent back to a Slave when all of its child jobs are Finished.
+    /// </summary>
+    WaitingForChildJobs,
+
+    /// <summary>
+    /// Job is actively calculated on a Slave
+    /// </summary>
+    Calculating,
+    
     /// <summary>
     /// Job as finished and is ready to be collected by the Client
@@ -46 +56 @@
     /// Job as been aborted due to an error. Results are ready to be collected
     /// </summary>
-    Failed,
-
-    /// <summary>
-    /// The job is paused and waits on the server to be sent back to a Slave when all of its child jobs are Finished.
-    /// </summary>
-    WaitForChildJobs
+    Failed
   };
 
@@ -67 +72 @@
     public static bool IsWaiting(this JobState jobState) {
       return jobState == JobState.Waiting ||
-        jobState == JobState.WaitForChildJobs;
+        jobState == JobState.WaitingForChildJobs;
     }
 

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/LightweightJob.cs

@@ -29 +29 @@
   public class LightweightJob : HiveItem {
     [DataMember]
-    public Guid SlaveId { get; set; }
+    public Guid? SlaveId { get; set; }
     [DataMember]
-    public JobState State { get; set; }
+    public JobState JobState { get; set; }
     [DataMember]
-    public TimeSpan ExecutionTime { get; set; }
+    public TimeSpan? ExecutionTime { get; set; }
     [DataMember]
     public String Exception { get; set; }
@@ -45 +45 @@
     public Guid? ParentJobId { get; set; }
 
-    public LightweightJob() { }
+    public LightweightJob() {
+      JobState = DataTransfer.JobState.Offline;
+    }
 
     public LightweightJob(Job job) {
       this.SlaveId = job.SlaveId;
-      this.State = job.State;
+      this.JobState = job.JobState;
       this.ExecutionTime = job.ExecutionTime;
       this.Exception = job.Exception;
@@ -61 +63 @@
       var clone = (LightweightJob)base.Clone(cloner);
       clone.SlaveId = this.SlaveId;
-      clone.State = this.State;
+      clone.JobState = this.JobState;
       clone.ExecutionTime = this.ExecutionTime;
       clone.Exception = this.Exception;

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Slave.cs

@@ -33 +33 @@
     public int? FreeCores { get; set; }
     [DataMember]
-    public int? CpuSpeedPerCore { get; set; }
+    public int? CpuSpeed { get; set; }
     [DataMember]
     public int? Memory { get; set; }
@@ -39 +39 @@
     public int? FreeMemory { get; set; }
     [DataMember]
-    public SlaveState State { get; set; }
+    public SlaveState SlaveState { get; set; }
     [DataMember]
-    public CalendarState CalendarSyncStatus { get; set; }
+    public CalendarState CalendarSyncState { get; set; }
     [DataMember]
-    public Guid SlaveConfigId { get; set; }
+    public Guid? SlaveConfigId { get; set; }
     [DataMember]
     public bool IsAllowedToCalculate { get; set; }
 
+    public Slave() {
+      SlaveState = DataTransfer.SlaveState.Idle;
+    }
+
     public override string ToString() {
-      return base.ToString() + ", NrOfCores: " + Cores + ", NrOfFreeCores " + FreeCores + ", State: " + State;
+      return base.ToString() + ", NrOfCores: " + Cores + ", NrOfFreeCores " + FreeCores + ", State: " + SlaveState;
     }
 
@@ -55 +59 @@
       clone.Cores = this.Cores;
       clone.FreeCores = this.FreeCores;
-      clone.CpuSpeedPerCore = this.CpuSpeedPerCore;
+      clone.CpuSpeed = this.CpuSpeed;
       clone.Memory = this.Memory;
       clone.FreeMemory = this.FreeMemory;
-      clone.State = this.State;
-      clone.CalendarSyncStatus = this.CalendarSyncStatus;
+      clone.SlaveState = this.SlaveState;
+      clone.CalendarSyncState = this.CalendarSyncState;
       clone.SlaveConfigId = this.SlaveConfigId;
       clone.IsAllowedToCalculate = this.IsAllowedToCalculate;

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveGroup.cs

@@ -30 +30 @@
   public class SlaveGroup : Resource {
     [DataMember]
-    public List<Guid> ResourcesIds { get; set; }
+    public List<Guid> ChildResourcesIds { get; set; }
+    [DataMember]
+    public List<Guid> ParentResourcesIds { get; set; }
 
     public SlaveGroup() {
-      ResourcesIds = new List<Guid>();
+      ChildResourcesIds = new List<Guid>();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       var clone = (SlaveGroup)base.Clone(cloner);
-      clone.ResourcesIds = new List<Guid>(this.ResourcesIds);
+      clone.ChildResourcesIds = new List<Guid>(this.ChildResourcesIds);
+      clone.ParentResourcesIds = new List<Guid>(this.ParentResourcesIds);
       return clone;
     }