Changeset 3011 for trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2

Timestamp:

03/12/10 10:57:21 (14 years ago)

Author:

kgrading

Message:

changed the complete DAL to LINQ 2 SQL (with the exception of the job streaming), did a lot of refactoring, Introduced DTOs (that are named DTOs for better understanding), added the spring.NET Interceptor, reintroduced transactions and cleaned up the whole JobResult thing and updated a part of the config merger (#830)

Location:

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2

Files:

• BaseDao.cs (modified) (2 diffs)
• ClientConfigDao.cs (added)
• ClientDao.cs (modified) (2 diffs)
• ClientGroupDao.cs (added)
• ContextFactory.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj (modified) (3 diffs)
• Hive.dbml (modified) (4 diffs)
• Hive.dbml.layout (modified) (4 diffs)
• Hive.designer.cs (modified) (9 diffs)
• IClientDao.cs (deleted)
• IGenericDao.cs (deleted)
• IJobDao.cs (deleted)
• JobDao.cs (added)
• LINQDataAccessPlugin.cs (modified) (1 diff)
• PluginInfoDao.cs (added)

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/BaseDao.cs

@@ -5 +5 @@
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
-  public class BaseDao {
+  public abstract class BaseDao<TBusiness, TDatabaseEntity> {
     public static HiveDataContext Context {
       get {
@@ -11 +11 @@
       }
     }
+
+    public abstract TDatabaseEntity DtoToEntity(TBusiness source, TDatabaseEntity target);
+    public abstract TBusiness EntityToDto(TDatabaseEntity source, TBusiness target);
+
   }
 }

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientDao.cs

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Server.DataAccess;
+using System.Threading;
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
-  public class ClientDao: BaseDao, IClientDao {
+  public class ClientDao: BaseDao<ClientDto, Client>, IClientDao {
 
     public ClientDao() {      
     }
 
-    public ClientInfo FindById(Guid id) {
+    public ClientDto FindById(Guid id) {
       return (from client in Context.Clients
               where client.ResourceId.Equals(id)
-              select
-                new ClientInfo {
-                  CpuSpeedPerCore = client.CPUSpeed,
-                  FreeMemory = client.FreeMemory,
-                  Id = client.ResourceId,
-                  Login = client.Login,
-                  Memory = client.Memory,
-                  Name = client.Resource.Name,
-                  NrOfCores = client.NumberOfCores,
-                  NrOfFreeCores = client.NumberOfFreeCores,
-                  State = (State)Enum.Parse(typeof(State), client.Status)
-                }
+              select EntityToDto(client, null)
             ).SingleOrDefault();      
     }
 
-    public IEnumerable<ClientInfo> FindAll() {
+    public IEnumerable<ClientDto> FindAll() {
       return (from client in Context.Clients
               select
-                new ClientInfo {
-                                 CpuSpeedPerCore = client.CPUSpeed,
-                                 FreeMemory = client.FreeMemory,
-                                 Id = client.ResourceId,
-                                 Login = client.Login,
-                                 Memory = client.Memory,
-                                 Name = client.Resource.Name,
-                                 NrOfCores = client.NumberOfCores,
-                                 NrOfFreeCores = client.NumberOfFreeCores,
-                                 State = (State) Enum.Parse(typeof (State), client.Status)
-                               }
+                EntityToDto(client, null)
              ).ToList();
     }
 
+    public IEnumerable<ClientDto> FindAllClientsWithoutGroup() {
+      return (from client in Context.Clients
+              where client.Resource.ClientGroup_Resources.Count == 0
+              select EntityToDto(client, null)).ToList();
+    }
+
+    public ClientDto GetClientForJob(Guid jobId) {
+      return (from job in Context.Jobs
+              where job.JobId.Equals(jobId)
+              select EntityToDto(job.Client, null)).SingleOrDefault();
+    }
  
-    public ClientInfo Insert(ClientInfo info) {
-      Client c = new Client {
-                              CPUSpeed = info.CpuSpeedPerCore,
-                              FreeMemory = info.FreeMemory,
-                              Resource = new Resource {Name = info.Name, ResourceId = info.Id},
-                              Login = info.Login,
-                              Memory = info.Memory,
-                              NumberOfCores = info.NrOfCores,
-                              NumberOfFreeCores = info.NrOfFreeCores,
-                              Status = Enum.GetName(typeof (State), info.State)
-                            };
-
+    public ClientDto Insert(ClientDto info) {
+      Client c = DtoToEntity(info, null);      
       Context.Clients.InsertOnSubmit(c);
       Context.SubmitChanges();
@@ -65 +47 @@
     }
 
-    public void Delete(ClientInfo info) {
-      Client client = Context.Clients.SingleOrDefault(c => c.ResourceId.Equals(info.Id));
-      Context.Clients.DeleteOnSubmit(client);
-    }
-
-    public void Update(ClientInfo info) {
-      Client client = Context.Clients.SingleOrDefault(c => c.ResourceId.Equals(info.Id));
-      client.CPUSpeed = info.CpuSpeedPerCore;
-      client.FreeMemory = info.FreeMemory;
-      client.Resource.Name = info.Name;
-      client.Login = info.Login;
-      client.Memory = info.Memory;
-      client.NumberOfCores = info.NrOfCores;
-      client.NumberOfFreeCores = info.NrOfFreeCores;
-      client.Status = Enum.GetName(typeof (State), info.State);
+    //Cascading delete takes care of the rest
+    public void Delete(ClientDto info) {
+      Resource res = Context.Resources.SingleOrDefault(c => c.ResourceId.Equals(info.Id));            
+      Context.Resources.DeleteOnSubmit(res);
       Context.SubmitChanges();
     }
 
+    public void Update(ClientDto info) {
+      Client client = Context.Clients.SingleOrDefault(c => c.ResourceId.Equals(info.Id));
+      DtoToEntity(info, client);
+      try {
+        Console.WriteLine("Sending from thread: " + Thread.CurrentThread.ManagedThreadId);
+        Context.SubmitChanges();
+      } catch (System.Data.Linq.ChangeConflictException cce) {
+        Console.WriteLine(cce);        
+      }
+    }
 
+    public override Client DtoToEntity(ClientDto source, Client target) {
+      if (source == null)
+        return null;
+      if (target == null) 
+        target = new Client();
+      
+      target.CPUSpeed = source.CpuSpeedPerCore;
+      
+      if(target.Resource == null)
+        target.Resource = new Resource();
 
-    #region IGenericDao<ClientInfo,Client> Members
+      target.FreeMemory = source.FreeMemory;
+      target.Resource.Name = source.Name;
+      target.Resource.ResourceId = source.Id;
 
+      target.Login = source.Login;
+      target.Memory = source.Memory;
+      target.NumberOfCores = source.NrOfCores;
+      target.NumberOfFreeCores = source.NrOfFreeCores;
+      target.Status = Enum.GetName(typeof(State), source.State);
+      return target;
+    }
 
-
-    #endregion
+    public override ClientDto EntityToDto(Client source, ClientDto target) {
+      if (source == null)
+        return null;
+      if(target == null) 
+        target = new ClientDto();
+      target.CpuSpeedPerCore = source.CPUSpeed;
+      target.FreeMemory = source.FreeMemory;
+      target.Id = source.ResourceId;
+      target.Login = source.Login;
+      target.Memory = source.Memory;
+      target.Name = source.Resource.Name;
+      target.NrOfCores = source.NumberOfCores;
+      target.NrOfFreeCores = source.NumberOfFreeCores;
+      target.State = (State) Enum.Parse(typeof (State), source.Status);
+      return target;
+    }
   }
 }

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ContextFactory.cs

@@ -15 +15 @@
         return _hiveDataContext;        
       } 
+      set {
+        _hiveDataContext = value;
+      }
     }
   }

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj

@@ -87 +87 @@
   <ItemGroup>
     <Compile Include="BaseDao.cs" />
+    <Compile Include="ClientConfigDao.cs" />
     <Compile Include="ClientDao.cs" />
+    <Compile Include="ClientGroupDao.cs" />
     <Compile Include="ContextFactory.cs" />
     <Compile Include="Hive.designer.cs">
@@ -94 +96 @@
       <DependentUpon>Hive.dbml</DependentUpon>
     </Compile>
-    <Compile Include="IClientDao.cs" />
-    <Compile Include="IGenericDao.cs" />
-    <Compile Include="IJobDao.cs" />
+    <Compile Include="JobDao.cs" />
     <Compile Include="LINQDataAccessPlugin.cs" />
+    <Compile Include="PluginInfoDao.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
@@ -122 +123 @@
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
       <Name>HeuristicLab.Hive.Contracts-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.DataAccess\3.2\HeuristicLab.Hive.Server.DataAccess-3.2.csproj">
+      <Project>{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}</Project>
+      <Name>HeuristicLab.Hive.Server.DataAccess-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml

@@ -51 +51 @@
       <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
       <Column Name="Percentage" Type="System.Double" DbType="Float" CanBeNull="true" />
-      <Column Name="SerializedJob" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX)" CanBeNull="true" UpdateCheck="Never" />
+      <Column Name="SerializedJob" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX)" CanBeNull="true" UpdateCheck="Never" IsDelayLoaded="true" />
       <Column Name="DateCreated" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
       <Column Name="DateCalculated" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
@@ -58 +58 @@
       <Column Name="ProjectId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
       <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Column Name="CoresNeeded" Type="System.Int32" DbType="Int" CanBeNull="true" />
-      <Column Name="MemoryNeeded" Type="System.Int32" DbType="Int" CanBeNull="true" />
+      <Column Name="CoresNeeded" Type="System.Int32" DbType="Int" CanBeNull="false" />
+      <Column Name="MemoryNeeded" Type="System.Int32" DbType="Int" CanBeNull="false" />
       <Association Name="Job_AssignedResource" Member="AssignedResources" ThisKey="JobId" OtherKey="JobId" Type="AssignedResource" />
       <Association Name="Job_Job" Member="Jobs" ThisKey="JobId" OtherKey="ParentJobId" Type="Job" />
@@ -88 +88 @@
       <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
       <Column Name="PluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
-      <Column Name="RequiredPluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
+      <Column Name="RequiredPluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" UpdateCheck="Never" />
       <Association Name="Job_RequiredPlugin" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
       <Association Name="PluginInfo_RequiredPlugin" Member="PluginInfo" ThisKey="PluginId" OtherKey="PluginId" Type="PluginInfo" IsForeignKey="true" DeleteRule="CASCADE" DeleteOnNull="true" />
@@ -95 +95 @@
   <Table Name="dbo.Resource" Member="Resources">
     <Type Name="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="true" />
       <Association Name="Resource_AssignedResource" Member="AssignedResources" ThisKey="ResourceId" OtherKey="ResourceId" Type="AssignedResource" />

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml.layout

@@ -132 +132 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(3.625 : 9.70755126953125); (2.75 : 9.70755126953125)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(3.625 : 9.70755126953125); (2.75 : 9.70755126953125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Client/Client_UptimeStatistic" />
       <nodes>
@@ -139 +139 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(5.625 : 8.78770182291667); (9 : 8.78770182291667)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(5.625 : 8.78770182291667); (9 : 8.78770182291667)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Client/Client_Job" />
       <nodes>
@@ -146 +146 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(4.5 : 6.94399251302083); (4.5 : 7.625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(4.5 : 6.94399251302083); (4.5 : 7.625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_Client" />
       <nodes>
@@ -153 +153 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(4.625 : 11); (4.625 : 10.1651025390625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(4.625 : 11); (4.625 : 10.1651025390625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/ClientConfig/ClientConfig_Client" />
       <nodes>

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.designer.cs

@@ -604 +604 @@
     }
     
-    [Column(Storage="_UpDownTimeCalendar", DbType="Xml", UpdateCheck=UpdateCheck.Never)]
+    [Column(Storage="_UpDownTimeCalendar", DbType="Xml", CanBeNull=true, UpdateCheck=UpdateCheck.Never)]
     public System.Xml.Linq.XElement UpDownTimeCalendar
     {
@@ -1029 +1029 @@
     private System.Nullable<double> _Percentage;
     
-    private System.Data.Linq.Binary _SerializedJob;
+    private System.Data.Linq.Link<System.Data.Linq.Binary> _SerializedJob;
     
     private System.Nullable<System.DateTime> _DateCreated;
@@ -1043 +1043 @@
     private System.Nullable<System.Guid> _UserId;
     
-    private System.Nullable<int> _CoresNeeded;
-    
-    private System.Nullable<int> _MemoryNeeded;
+    private int _CoresNeeded;
+    
+    private int _MemoryNeeded;
     
     private EntitySet<AssignedResource> _AssignedResources;
@@ -1087 +1087 @@
     partial void OnUserIdChanging(System.Nullable<System.Guid> value);
     partial void OnUserIdChanged();
-    partial void OnCoresNeededChanging(System.Nullable<int> value);
+    partial void OnCoresNeededChanging(int value);
     partial void OnCoresNeededChanged();
-    partial void OnMemoryNeededChanging(System.Nullable<int> value);
+    partial void OnMemoryNeededChanging(int value);
     partial void OnMemoryNeededChanged();
     #endregion
@@ -1212 +1212 @@
     }
     
-    [Column(Storage="_SerializedJob", DbType="VarBinary(MAX)", UpdateCheck=UpdateCheck.Never)]
+    [Column(Storage="_SerializedJob", DbType="VarBinary(MAX)", CanBeNull=true, UpdateCheck=UpdateCheck.Never)]
     public System.Data.Linq.Binary SerializedJob
     {
       get
       {
-        return this._SerializedJob;
-      }
-      set
-      {
-        if ((this._SerializedJob != value))
+        return this._SerializedJob.Value;
+      }
+      set
+      {
+        if ((this._SerializedJob.Value != value))
         {
           this.OnSerializedJobChanging(value);
           this.SendPropertyChanging();
-          this._SerializedJob = value;
+          this._SerializedJob.Value = value;
           this.SendPropertyChanged("SerializedJob");
           this.OnSerializedJobChanged();
@@ -1357 +1357 @@
     
     [Column(Storage="_CoresNeeded", DbType="Int")]
-    public System.Nullable<int> CoresNeeded
+    public int CoresNeeded
     {
       get
@@ -1377 +1377 @@
     
     [Column(Storage="_MemoryNeeded", DbType="Int")]
-    public System.Nullable<int> MemoryNeeded
+    public int MemoryNeeded
     {
       get
@@ -1953 +1953 @@
     }
     
-    [Column(Storage="_RequiredPluginId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
+    [Column(Storage="_RequiredPluginId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true, UpdateCheck=UpdateCheck.Never)]
     public System.Guid RequiredPluginId
     {
@@ -2099 +2099 @@
     }
     
-    [Column(Storage="_ResourceId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
+    [Column(Storage="_ResourceId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
     public System.Guid ResourceId
     {

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/LINQDataAccessPlugin.cs

@@ -9 +9 @@
   [PluginFile("HeuristicLab.Hive.Server.LINQDataAccess-3.2.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
+  [PluginDependency("HeuristicLab.Hive.Server.DataAccess-3.2")]
   public class LINQDataAccessPlugin: PluginBase {
   }