Changeset 9391 for branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveDtoDao.cs

Timestamp:

04/23/13 10:37:45 (11 years ago)

Author:

pfleck

Message:

#2030
Separated old DTO-Dao from new Dao. DTO-Dao should be replaced completely.
Heartbeat and UpdateTaskState uses new Dao.
DataContext is now closed on ServiceOperation end.

Location:

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3

Files:

• . (modified) (1 prop)
• HiveDtoDao.cs (moved) (moved from branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs) (11 diffs)

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3

@@ -2 +2 @@
 bin
 obj
+*.user

@@ -2 +2 @@
 bin
 obj
+*.user

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveDtoDao.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Linq;
 using System.Linq;
 using System.Linq.Expressions;
@@ -28 +27 @@
 
 namespace HeuristicLab.Services.Hive.DataAccess {
-  public class HiveDao : IHiveDao {
+  public class HiveDtoDao : IHiveDtoDao {
     public static HiveDataContext CreateContext(bool longRunning = false) {
       var context = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
@@ -35 +34 @@
     }
 
-    public HiveDao() { }
+    public HiveDtoDao() { }
 
     #region Task Methods
@@ -43 +42 @@
       }
     }
-
-    public Task GetTaskDA(Guid id) {
-      var db = HiveOperationContext.Current.DataContext;
-      return GetTaskByIdQuery(db, id).SingleOrDefault();
-    }
-
-    private static Func<HiveDataContext, Guid, IQueryable<Task>> GetTaskByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid id) =>
-      from t in db.Tasks
-      where t.TaskId == id
-      select t
-    );
 
     public IEnumerable<DT.Task> GetTasks(Expression<Func<Task, bool>> predicate) {
@@ -150 +138 @@
         db.SubmitChanges();
       }
-    }
-
-    public void UpdateTaskDA(Task task) {
-      var db = HiveOperationContext.Current.DataContext;
-      db.SubmitChanges();
     }
 
@@ -212 +195 @@
     }
 
-    public IQueryable<TaskInfoForScheduler> GetWaitingTasksDA(Slave slave) {
-      var db = HiveOperationContext.Current.DataContext;
-
-      var parentResources = GetParentResourcesDA(slave.ResourceId);
-      var resourceIds = parentResources.Select(x => x.ResourceId);
-      //Originally we checked here if there are parent tasks which should be calculated (with GetParentTasks(resourceIds, count, false);).
-      //Because there is at the moment no case where this makes sense (there don't exist parent tasks which need to be calculated), 
-      //we skip this step because it's wasted runtime
-
-      return from ar in db.AssignedResources
-             where resourceIds.Contains(ar.ResourceId)
-                 && !(ar.Task.IsParentTask && ar.Task.FinishWhenChildJobsFinished)
-                 && ar.Task.State == TaskState.Waiting
-                 && ar.Task.CoresNeeded <= slave.FreeCores
-                 && ar.Task.MemoryNeeded <= slave.FreeMemory
-             select new TaskInfoForScheduler() { TaskId = ar.Task.TaskId, JobId = ar.Task.JobId, Priority = ar.Task.Priority };
-    }
-
-    /*private static Func<HiveDataContext, Guid, Slave, IQueryable<TaskInfoForScheduler>> GetWaitingTasksQuery = CompiledQuery.Compile((HiveDataContext db, Guid id, Slave slave) =>
-      from ar in db.AssignedResources
-      where ar.ResourceId == id
-          && !(ar.Task.IsParentTask && ar.Task.FinishWhenChildJobsFinished)
-          && ar.Task.State == TaskState.Waiting
-          && ar.Task.CoresNeeded <= slave.FreeCores
-          && ar.Task.MemoryNeeded <= slave.FreeMemory
-      select new TaskInfoForScheduler() { TaskId = ar.Task.TaskId, JobId = ar.Task.JobId, Priority = ar.Task.Priority }
-    );*/
-
     public DT.Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception) {
       using (var db = CreateContext()) {
@@ -267 +222 @@
         return DT.Convert.ToDto(task);
       }
-    }
-
-    public Task UpdateTaskStateDA(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception) {
-      var db = HiveOperationContext.Current.DataContext;
-
-      db.StateLogs.InsertOnSubmit(new StateLog {
-        TaskId = taskId,
-        State = taskState,
-        SlaveId = slaveId,
-        UserId = userId,
-        Exception = exception,
-        DateTime = DateTime.Now
-      });
-
-      var task = GetTaskDA(taskId);
-      task.State = taskState;
-
-      db.SubmitChanges();
-
-      return task;
     }
     #endregion
@@ -581 +516 @@
     }
 
-    public Slave GetSlaveDA(Guid id) {
-      var db = HiveOperationContext.Current.DataContext;
-      return GetSlaveByIdQuery(db, id).SingleOrDefault();
-    }
-
-    private static Func<HiveDataContext, Guid, IQueryable<Slave>> GetSlaveByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid slaveId) =>
-      from s in db.Resources.OfType<Slave>()
-      where s.ResourceId == slaveId
-      select s
-    );
-
     public IEnumerable<DT.Slave> GetSlaves(Expression<Func<Slave, bool>> predicate) {
       using (var db = CreateContext()) {
@@ -614 +538 @@
         db.SubmitChanges();
       }
-    }
-
-    public void UpdateSlaveDA(Slave slave) {
-      var db = HiveOperationContext.Current.DataContext;
-      db.SubmitChanges();
     }
 
@@ -736 +655 @@
     }
 
-    public IQueryable<Guid> GetAssignedResourcesIdsDA(Guid taskId) {
-      var db = HiveOperationContext.Current.DataContext;
-      return GetAssignedResourcesIdQuery(db, taskId);
-    }
-
-    private static Func<HiveDataContext, Guid, IQueryable<Guid>> GetAssignedResourcesIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid taskId) =>
-     from ar in db.AssignedResources
-     where ar.TaskId == taskId
-     select ar.ResourceId
-   );
-
     /// <summary>
     /// Returns all parent resources of a resource (the given resource is also added)
@@ -757 +665 @@
       }
     }
-
-    public IEnumerable<Resource> GetParentResourcesDA(Guid resourceId) {
-      var db = HiveOperationContext.Current.DataContext;
-      var child = db.Resources.Single(r => r.ResourceId == resourceId);
-
-      yield return child;
-      while (child.ParentResource != null) {
-        child = child.ParentResource;
-        yield return child;
-      }
-    }
-
-    public IEnumerable<Guid> GetParentResourcesIDsDA(Guid resourceId) {
-      var db = HiveOperationContext.Current.DataContext;
-      var child = db.Resources.Single(r => r.ResourceId == resourceId);
-
-      yield return resourceId;
-      while (child.ParentResource != null) {
-        child = child.ParentResource;
-        yield return child.ResourceId;
-      }
-    }
-
-    public IQueryable<int> GetNumberOfDowntimesFromParentResourcesAtCurrentTimeDA(Guid resourceId, DowntimeType type) {
-      var db = HiveOperationContext.Current.DataContext;
-
-      var ids = GetParentResourcesIDsDA(resourceId).ToArray();
-
-      return from r in db.Resources
-             where ids.Contains(r.ResourceId)
-             select (from d in db.Downtimes
-                     where d.ResourceId == r.ResourceId && d.DowntimeType == type && (DateTime.Now >= d.StartDate) && (DateTime.Now <= d.EndDate)
-                     select d).Count();
-    }
-
-    /*private static Func<HiveDataContext, Guid, DowntimeType, int> GetNumberOfDowntimesAtCurrentTimeQuery =
-      CompiledQuery.Compile((HiveDataContext db, Guid ids, DowntimeType type) =>
-        (from d in db.Downtimes
-         where d.ResourceId == ids && d.DowntimeType == type && (DateTime.Now >= d.StartDate) && (DateTime.Now <= d.EndDate)
-         select d).Count()
-    );*/
 
     private static void CollectParentResources(ICollection<Resource> resources, Resource resource) {

@@ -2 +2 @@
 bin
 obj
+*.user