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

Timestamp:

01/25/11 17:34:47 (13 years ago)

Author:

ascheibe

Message:

#1233

• added various bits to the Hive Server
• adjusted data model

Location:

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

Files:

• Convert.cs (modified) (1 diff)
• HiveDao.cs (modified) (3 diffs)
• HiveDataContext.dbml (modified) (3 diffs)
• HiveDataContext.dbml.layout (modified) (2 diffs)
• HiveDataContext.designer.cs (modified) (11 diffs)

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

@@ -126 +126 @@
     public static DT.PluginData ToDto(PluginData source) {
       if (source == null) return null;
-      return new DT.PluginData { PluginId = source.PluginId, Data = source.Data.ToArray(), FileName = source.FileName };
+      return new DT.PluginData { PluginId = source.PluginId, Data = source.Data.ToArray(), FileName = source.FileName, PluginDataId = source.PluginDataId };
     }
     public static PluginData ToEntity(DT.PluginData source) {

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

@@ -90 +90 @@
                     orderby ar.Job.Priority descending
                     select Convert.ToDto(ar.Job);
-        return query;
+        return query.ToArray();
       }
     }
@@ -100 +100 @@
                     orderby j.Priority descending
                     select Convert.ToDto(j);
-        return query.Union(GetWaitingParentJobs(slave.Id)).OrderByDescending(x => x.Priority).ToArray();
+        var waitingJobs = query.ToArray();
+        var waitingParentJobs = GetWaitingParentJobs(slave.Id);
+        return waitingJobs.Union(waitingParentJobs).OrderByDescending(x => x.Priority);
       }
     }
@@ -322 +324 @@
     public Guid AddSlaveGroup(DT.SlaveGroup dto) {
       using (var db = CreateContext()) {
+        if (dto.Id == Guid.Empty)
+          dto.Id = Guid.NewGuid();
         var entity = Convert.ToEntity(dto);
         db.Resources.InsertOnSubmit(entity);

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

@@ -15 +15 @@
       <Column Name="Version" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
       <Association Name="Plugin_RequiredPlugin" Member="RequiredPlugins" ThisKey="PluginId" OtherKey="PluginId" Type="RequiredPlugin" />
-      <Association Name="Plugin_PluginData" Member="PluginData" ThisKey="PluginId" OtherKey="PluginId" Type="PluginData" Cardinality="One" />
+      <Association Name="Plugin_PluginData" Member="PluginData" ThisKey="PluginId" OtherKey="PluginId" Type="PluginData" />
     </Type>
   </Table>
@@ -29 +29 @@
   <Table Name="dbo.Resource" Member="Resources">
     <Type Name="Resource" InheritanceCode="RESOURCE">
-      <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
+      <Column Name="ResourceId" AutoSync="OnInsert" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
       <Column Name="Name" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
       <Column Name="ResourceType" Type="System.String" CanBeNull="false" IsDiscriminator="true" />
@@ -112 +112 @@
       <Column Name="Data" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX) NOT NULL" CanBeNull="false" UpdateCheck="Never" />
       <Column Name="FileName" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
+      <Column Name="PluginDataId" Type="System.Int32" DbType="Int IDENTITY(1,1)" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
       <Association Name="Plugin_PluginData" Member="Plugin" ThisKey="PluginId" OtherKey="PluginId" Type="Plugin" IsForeignKey="true" />
     </Type>

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

@@ -124 +124 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" absoluteBounds="11.375, 5.5, 2, 1.3862939453124996">
+    <classShape Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" absoluteBounds="11.625, 5.5, 2, 1.5785953776041666">
       <DataClassMoniker Name="/HiveDataContext/PluginData" />
       <nestedChildShapes>
-        <elementListCompartment Id="acddb513-7de6-4bb4-8335-d6982fb2ef35" absoluteBounds="11.39, 5.9600000000000009, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="acddb513-7de6-4bb4-8335-d6982fb2ef35" absoluteBounds="11.64, 5.9600000000000009, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(11 : 6.19314697265625); (11.375 : 6.19314697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(11 : 6.19314697265625); (11.625 : 6.19314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_PluginData" />
       <nodes>
@@ -137 +137 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_JobData" />
       <nodes>

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

@@ -55 +55 @@
     partial void UpdateJobData(JobData instance);
     partial void DeleteJobData(JobData instance);
+    partial void InsertPluginData(PluginData instance);
+    partial void UpdatePluginData(PluginData instance);
+    partial void DeletePluginData(PluginData instance);
     #endregion
     
@@ -360 +363 @@
     private EntitySet<RequiredPlugin> _RequiredPlugins;
     
+    private EntitySet<PluginData> _PluginData;
+    
     #region Extensibility Method Definitions
     partial void OnLoaded();
@@ -375 +380 @@
     {
       this._RequiredPlugins = new EntitySet<RequiredPlugin>(new Action<RequiredPlugin>(this.attach_RequiredPlugins), new Action<RequiredPlugin>(this.detach_RequiredPlugins));
+      this._PluginData = new EntitySet<PluginData>(new Action<PluginData>(this.attach_PluginData), new Action<PluginData>(this.detach_PluginData));
       OnCreated();
     }
@@ -451 +457 @@
     }
     
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Plugin_PluginData", Storage="_PluginData", ThisKey="PluginId", OtherKey="PluginId")]
+    public EntitySet<PluginData> PluginData
+    {
+      get
+      {
+        return this._PluginData;
+      }
+      set
+      {
+        this._PluginData.Assign(value);
+      }
+    }
+    
     public event PropertyChangingEventHandler PropertyChanging;
     
@@ -478 +497 @@
     
     private void detach_RequiredPlugins(RequiredPlugin entity)
+    {
+      this.SendPropertyChanging();
+      entity.Plugin = null;
+    }
+    
+    private void attach_PluginData(PluginData entity)
+    {
+      this.SendPropertyChanging();
+      entity.Plugin = this;
+    }
+    
+    private void detach_PluginData(PluginData entity)
     {
       this.SendPropertyChanging();
@@ -724 +755 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
     public System.Guid ResourceId
     {
@@ -2386 +2417 @@
   
   [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
-  public partial class PluginData
+  public partial class PluginData : INotifyPropertyChanging, INotifyPropertyChanged
   {
     
+    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+    
     private System.Guid _PluginId;
     
@@ -2395 +2428 @@
     private string _FileName;
     
+    private int _PluginDataId;
+    
+    private EntityRef<Plugin> _Plugin;
+    
+    #region Extensibility Method Definitions
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnPluginIdChanging(System.Guid value);
+    partial void OnPluginIdChanged();
+    partial void OnDataChanging(System.Data.Linq.Binary value);
+    partial void OnDataChanged();
+    partial void OnFileNameChanging(string value);
+    partial void OnFileNameChanged();
+    partial void OnPluginDataIdChanging(int value);
+    partial void OnPluginDataIdChanged();
+    #endregion
+    
     public PluginData()
     {
+      this._Plugin = default(EntityRef<Plugin>);
+      OnCreated();
     }
     
@@ -2410 +2463 @@
         if ((this._PluginId != value))
         {
+          if (this._Plugin.HasLoadedOrAssignedValue)
+          {
+            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+          }
+          this.OnPluginIdChanging(value);
+          this.SendPropertyChanging();
           this._PluginId = value;
+          this.SendPropertyChanged("PluginId");
+          this.OnPluginIdChanged();
         }
       }
@@ -2426 +2487 @@
         if ((this._Data != value))
         {
+          this.OnDataChanging(value);
+          this.SendPropertyChanging();
           this._Data = value;
+          this.SendPropertyChanged("Data");
+          this.OnDataChanged();
         }
       }
@@ -2442 +2507 @@
         if ((this._FileName != value))
         {
+          this.OnFileNameChanging(value);
+          this.SendPropertyChanging();
           this._FileName = value;
-        }
+          this.SendPropertyChanged("FileName");
+          this.OnFileNameChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PluginDataId", AutoSync=AutoSync.OnInsert, DbType="Int IDENTITY(1,1)", IsPrimaryKey=true, IsDbGenerated=true)]
+    public int PluginDataId
+    {
+      get
+      {
+        return this._PluginDataId;
+      }
+      set
+      {
+        if ((this._PluginDataId != value))
+        {
+          this.OnPluginDataIdChanging(value);
+          this.SendPropertyChanging();
+          this._PluginDataId = value;
+          this.SendPropertyChanged("PluginDataId");
+          this.OnPluginDataIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Plugin_PluginData", Storage="_Plugin", ThisKey="PluginId", OtherKey="PluginId", IsForeignKey=true)]
+    public Plugin Plugin
+    {
+      get
+      {
+        return this._Plugin.Entity;
+      }
+      set
+      {
+        Plugin previousValue = this._Plugin.Entity;
+        if (((previousValue != value) 
+              || (this._Plugin.HasLoadedOrAssignedValue == false)))
+        {
+          this.SendPropertyChanging();
+          if ((previousValue != null))
+          {
+            this._Plugin.Entity = null;
+            previousValue.PluginData.Remove(this);
+          }
+          this._Plugin.Entity = value;
+          if ((value != null))
+          {
+            value.PluginData.Add(this);
+            this._PluginId = value.PluginId;
+          }
+          else
+          {
+            this._PluginId = default(System.Guid);
+          }
+          this.SendPropertyChanged("Plugin");
+        }
+      }
+    }
+    
+    public event PropertyChangingEventHandler PropertyChanging;
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    
+    protected virtual void SendPropertyChanging()
+    {
+      if ((this.PropertyChanging != null))
+      {
+        this.PropertyChanging(this, emptyChangingEventArgs);
+      }
+    }
+    
+    protected virtual void SendPropertyChanged(String propertyName)
+    {
+      if ((this.PropertyChanged != null))
+      {
+        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
       }
     }