Changeset 3011 for trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs

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)

File:

• trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs (modified) (20 diffs)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs

@@ -37 +37 @@
   class JobAdapter :
     DataAdapterBase<dsHiveServerTableAdapters.JobTableAdapter,
-                      Job, 
+                      JobDto, 
                       dsHiveServer.JobRow>, 
     IJobAdapter {
@@ -87 +87 @@
         if (clientAdapter == null)
           clientAdapter = 
-            this.Session.GetDataAdapter<ClientInfo, IClientAdapter>();
+            this.Session.GetDataAdapter<ClientDto, IClientAdapter>();
 
         return clientAdapter;
@@ -112 +112 @@
         if (pluginInfoAdapter == null) {
           pluginInfoAdapter =
-            this.Session.GetDataAdapter<HivePluginInfo, IPluginInfoAdapter>();
+            this.Session.GetDataAdapter<HivePluginInfoDto, IPluginInfoAdapter>();
         }
 
@@ -125 +125 @@
         if (projectAdapter == null) {
           projectAdapter =
-            this.Session.GetDataAdapter<Project, IProjectAdapter>();
+            this.Session.GetDataAdapter<ProjectDto, IProjectAdapter>();
         }
 
@@ -137 +137 @@
 
     #region Overrides
-    protected override Job ConvertRow(dsHiveServer.JobRow row,
-      Job job) {
+    protected override JobDto ConvertRow(dsHiveServer.JobRow row,
+      JobDto job) {
       if (row != null && job != null) {
         job.Id = row.JobId;
@@ -203 +203 @@
         job.PluginsNeeded.Clear();
         foreach (Guid requiredPlugin in requiredPlugins) {
-          HivePluginInfo pluginInfo = 
+          HivePluginInfoDto pluginInfo = 
             PluginInfoAdapter.GetById(requiredPlugin);
 
@@ -218 +218 @@
     }
 
-    protected override dsHiveServer.JobRow ConvertObj(Job job,
+    protected override dsHiveServer.JobRow ConvertObj(JobDto job,
       dsHiveServer.JobRow row) {
       if (job != null && row != null) {
@@ -250 +250 @@
           row.SetJobStateNull();
 
+        //Todo: commout
+        /*
         row.Percentage = job.Percentage;
 
@@ -266 +268 @@
         row.CoresNeeded = job.CoresNeeded;
 
-        row.MemoryNeeded = job.MemoryNeeded;
+        row.MemoryNeeded = job.MemoryNeeded;*/
 
         if (job.Project != null)
@@ -279 +281 @@
 
     #region IJobAdapter Members
-    public ICollection<Job> GetAllSubjobs(Job job) {
+    public ICollection<JobDto> GetAllSubjobs(JobDto job) {
       if (job != null) {
         return
@@ -291 +293 @@
     }
 
-    public ICollection<Job> GetJobsByState(State state) {
+    public ICollection<JobDto> GetJobsByState(State state) {
       return
          base.FindMultiple(
@@ -299 +301 @@
     }
 
-    public ICollection<Job> GetJobsOf(ClientInfo client) {
+    public ICollection<JobDto> GetJobsOf(ClientDto client) {
       if (client != null) {
         return
@@ -311 +313 @@
     }
 
-    public ICollection<Job> GetActiveJobsOf(ClientInfo client) {
+    public ICollection<JobDto> GetActiveJobsOf(ClientDto client) {
 
       if (client != null) {
@@ -324 +326 @@
     }
 
-    public ICollection<Job> GetJobsOf(Guid userId) {      
+    public ICollection<JobDto> GetJobsOf(Guid userId) {      
       return 
           base.FindMultiple(
@@ -332 +334 @@
     }
 
-    public ICollection<Job> FindJobs(State state, int cores, int memory,
+    public ICollection<JobDto> FindJobs(State state, int cores, int memory,
       Guid resourceId) {
       return
@@ -345 +347 @@
     }
 
-    public ICollection<Job> GetJobsByProject(Guid projectId) {
+    public ICollection<JobDto> GetJobsByProject(Guid projectId) {
       return
          base.FindMultiple(
@@ -353 +355 @@
     }
 
-    protected override void doUpdate(Job obj) {
+    protected override void doUpdate(JobDto obj) {
       if (obj != null) {
         ProjectAdapter.Update(obj.Project);
@@ -364 +366 @@
         List<Guid> relationships =
           new List<Guid>();
-        foreach (HivePluginInfo pluginInfo in obj.PluginsNeeded) {
+        foreach (HivePluginInfoDto pluginInfo in obj.PluginsNeeded) {
           //first check if pluginInfo already exists in the db
-          HivePluginInfo found = PluginInfoAdapter.GetByNameVersionBuilddate(
+          HivePluginInfoDto found = PluginInfoAdapter.GetByNameVersionBuilddate(
             pluginInfo.Name, pluginInfo.Version, pluginInfo.BuildDate);
           if (found != null) {
@@ -384 +386 @@
     }
 
-    protected override bool doDelete(Job job) {
+    protected override bool doDelete(JobDto job) {
       if (job != null) {
         dsHiveServer.JobRow row =
@@ -403 +405 @@
 
           //delete orphaned pluginInfos
-          ICollection<HivePluginInfo> orphanedPluginInfos =
+          ICollection<HivePluginInfoDto> orphanedPluginInfos =
              PluginInfoAdapter.GetOrphanedPluginInfos();
-          foreach(HivePluginInfo orphanedPlugin in orphanedPluginInfos) {
+          foreach(HivePluginInfoDto orphanedPlugin in orphanedPluginInfos) {
             PluginInfoAdapter.Delete(orphanedPlugin);
           }