Changeset 9391

Timestamp:

04/23/13 10:37:45 (12 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

Files:

• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3 (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveDtoDao.cs (moved) (moved from branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs) (11 diffs)
• HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveOperationContext.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (60 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDtoDao.cs (moved) (moved from branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs) (5 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (11 diffs)
• HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (1 diff)

branches/HivePerformance/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs

@@ -36 +36 @@
 public partial class Status : System.Web.UI.Page {
   protected void Page_Load(object sender, EventArgs e) {
-    var dao = ServiceLocator.Instance.HiveDao;
+    var dao = ServiceLocator.Instance.HiveDtoDao;
     var transactionManager = ServiceLocator.Instance.TransactionManager;
     var resourceName = Request.QueryString["resource"];

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/HeuristicLab.Services.Hive-3.3.csproj

@@ -138 +138 @@
     <Compile Include="DataTransfer\UserStatistics.cs" />
     <Compile Include="HiveDao.cs" />
+    <Compile Include="HiveDtoDao.cs" />
     <Compile Include="HiveJanitor.cs" />
     <Compile Include="HiveOperationContext.cs" />
     <Compile Include="Interfaces\IHiveDao.cs" />
+    <Compile Include="Interfaces\IHiveDtoDao.cs" />
     <Compile Include="Interfaces\ITaskScheduler.cs" />
     <Compile Include="Scheduler\TaskInfoForScheduler.cs" />

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) {

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

@@ -37 +37 @@
     }
 
-    private IHiveDao dao {
-      get { return ServiceLocator.Instance.HiveDao; }
+    private IHiveDtoDao dao {
+      get { return ServiceLocator.Instance.HiveDtoDao; }
     }
 

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.ServiceModel;
+using System.ServiceModel.Channels;
+using System.ServiceModel.Description;
+using System.ServiceModel.Dispatcher;
 using System.Text;
 using HeuristicLab.Services.Hive.DataAccess;
@@ -30 +35 @@
     public static HiveOperationContext Current {
       get {
-        var context = OperationContext.Current.Extensions.Find<HiveOperationContext>();
-        if (context == null) {
-          context = new HiveOperationContext();
-          OperationContext.Current.Extensions.Add(context);
-        }
-        return context;
+        return OperationContext.Current.Extensions.Find<HiveOperationContext>();
       }
     }
@@ -42 +42 @@
 
     public void Attach(OperationContext owner) {
-      DataContext = HiveDao.CreateContext();
+      DataContext = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
       //DataContext.Log = new DebugWriter();
     }
 
     public void Detach(OperationContext owner) {
-      // nothing
+      DataContext.Dispose();
+    }
+  }
+
+  public class HiveOperationContextMessageInspector : IDispatchMessageInspector {
+    public object AfterReceiveRequest(ref Message request, IClientChannel channel, InstanceContext instanceContext) {
+      OperationContext.Current.Extensions.Add(new HiveOperationContext());
+      return request.Headers.MessageId;
+    }
+
+    public void BeforeSendReply(ref System.ServiceModel.Channels.Message reply, object correlationState) {
+      OperationContext.Current.Extensions.Remove(HiveOperationContext.Current);
+    }
+  }
+
+  public class HiveOperationContextBehaviorAttribute : Attribute, IServiceBehavior {
+    public void AddBindingParameters(ServiceDescription serviceDescription, ServiceHostBase serviceHostBase,
+      Collection<ServiceEndpoint> endpoints, BindingParameterCollection bindingParameters) {
+    }
+
+    public void ApplyDispatchBehavior(ServiceDescription serviceDescription, ServiceHostBase serviceHostBase) {
+      foreach (ChannelDispatcher cd in serviceHostBase.ChannelDispatchers) {
+        foreach (EndpointDispatcher ed in cd.Endpoints) {
+          ed.DispatchRuntime.MessageInspectors.Add(new HiveOperationContextMessageInspector());
+        }
+      }
+    }
+
+    public void Validate(ServiceDescription serviceDescription, ServiceHostBase serviceHostBase) {
     }
   }

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

@@ -37 +37 @@
   /// </summary>
   [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, IgnoreExtensionDataObject = true)]
+  [HiveOperationContextBehavior]
   public class HiveService : IHiveService {
+    private IHiveDtoDao dtoDao {
+      get { return ServiceLocator.Instance.HiveDtoDao; }
+    }
     private IHiveDao dao {
       get { return ServiceLocator.Instance.HiveDao; }
@@ -64 +68 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        task.Id = dao.AddTask(task);
+        task.Id = dtoDao.AddTask(task);
         taskData.TaskId = task.Id;
         taskData.LastUpdate = DateTime.Now;
-        dao.AssignJobToResource(task.Id, resourceIds);
-        dao.AddTaskData(taskData);
-        dao.UpdateTaskState(task.Id, DA.TaskState.Waiting, null, userManager.CurrentUserId, null);
+        dtoDao.AssignJobToResource(task.Id, resourceIds);
+        dtoDao.AddTaskData(taskData);
+        dtoDao.UpdateTaskState(task.Id, DA.TaskState.Waiting, null, userManager.CurrentUserId, null);
         return taskData.TaskId;
       }, false, true);
@@ -78 +82 @@
       return trans.UseTransaction(() => {
         task.ParentTaskId = parentTaskId;
-        return AddTask(task, taskData, dao.GetAssignedResources(parentTaskId).Select(x => x.Id));
+        return AddTask(task, taskData, dtoDao.GetAssignedResources(parentTaskId).Select(x => x.Id));
       }, false, true);
     }
@@ -87 +91 @@
 
       return trans.UseTransaction(() => {
-        return dao.GetTask(taskId);
+        return dtoDao.GetTask(taskId);
       }, false, false);
     }
@@ -94 +98 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        var tasks = dao.GetTasks(x => true);
+        var tasks = dtoDao.GetTasks(x => true);
         foreach (var task in tasks)
           author.AuthorizeForTask(task.Id, Permission.Read);
@@ -105 +109 @@
 
       return trans.UseTransaction(() => {
-        var tasks = dao.GetTasks(x => taskIds.Contains(x.TaskId)).Select(x => new LightweightTask(x)).ToArray();
+        var tasks = dtoDao.GetTasks(x => taskIds.Contains(x.TaskId)).Select(x => new LightweightTask(x)).ToArray();
         foreach (var task in tasks)
           author.AuthorizeForTask(task.Id, Permission.Read);
@@ -128 +132 @@
 
       return trans.UseTransaction(() => {
-        return dao.GetLightweightTasks(task => task.JobId == jobId).ToArray();
+        return dtoDao.GetLightweightTasks(task => task.JobId == jobId).ToArray();
       }, false, true);
     }
@@ -137 +141 @@
 
       return trans.UseTransaction(() => {
-        return dao.GetLightweightTasksWithoutStateLog(task => task.JobId == jobId).ToArray();
+        return dtoDao.GetLightweightTasksWithoutStateLog(task => task.JobId == jobId).ToArray();
       }, false, false);
     }
@@ -146 +150 @@
 
       return trans.UseTransaction(() => {
-        return dao.GetTaskData(taskId);
+        return dtoDao.GetTaskData(taskId);
       });
     }
@@ -155 +159 @@
 
       trans.UseTransaction(() => {
-        dao.UpdateTaskAndPlugins(taskDto);
+        dtoDao.UpdateTaskAndPlugins(taskDto);
       });
     }
@@ -163 +167 @@
       author.AuthorizeForTask(task.Id, Permission.Full);
 
-      trans.UseTransaction(() => {
-        dao.UpdateTaskAndPlugins(task);
-      });
-
-      trans.UseTransaction(() => {
-        taskData.LastUpdate = DateTime.Now;
-        dao.UpdateTaskData(taskData);
+      // what for?
+      /*trans.UseTransaction(() => {
+        dtoDao.UpdateTaskAndPlugins(task);
+      });*/
+
+      trans.UseTransaction(() => {
+        var data = dao.GetTaskDataByDto(taskData);
+        data.LastUpdate = DateTime.Now;
+        dao.UpdateTaskData(data);
       });
     }
@@ -177 +183 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        dao.DeleteTask(taskId);
+        dtoDao.DeleteTask(taskId);
       });
     }
@@ -187 +193 @@
         var tasks = GetChildTasks(parentTaskId, true, false);
         foreach (var task in tasks) {
-          dao.DeleteTask(task.Id);
-          dao.DeleteTaskData(task.Id);
+          dtoDao.DeleteTask(task.Id);
+          dtoDao.DeleteTaskData(task.Id);
         };
       });
@@ -196 +202 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForTask(taskId, Permission.Full);
-      return trans.UseTransaction(() => {
-        Task task = dao.UpdateTaskState(taskId, DataTransfer.Convert.ToEntity(taskState), slaveId, userId, exception);
-
-        if (task.Command.HasValue && task.Command.Value == Command.Pause && task.State == TaskState.Paused) {
+
+      return trans.UseTransaction(() => {
+        var task = dao.UpdateTaskState(taskId, DT.Convert.ToEntity(taskState), slaveId, userId, exception);
+
+        if (task.Command.HasValue && task.Command.Value == DA.Command.Pause && task.State == DA.TaskState.Paused) {
           task.Command = null;
-        } else if (task.Command.HasValue && task.Command.Value == Command.Abort && task.State == TaskState.Aborted) {
+        } else if (task.Command.HasValue && task.Command.Value == DA.Command.Abort && task.State == DA.TaskState.Aborted) {
           task.Command = null;
-        } else if (task.Command.HasValue && task.Command.Value == Command.Stop && task.State == TaskState.Aborted) {
+        } else if (task.Command.HasValue && task.Command.Value == DA.Command.Stop && task.State == DA.TaskState.Aborted) {
           task.Command = null;
         } else if (taskState == TaskState.Paused && !task.Command.HasValue) {
           // slave paused and uploaded the task (no user-command) -> set waiting.
-          task = dao.UpdateTaskState(taskId, DataTransfer.Convert.ToEntity(TaskState.Waiting), slaveId, userId, exception);
-        }
-
-        dao.UpdateTaskAndPlugins(task);
-        return task;
+          task = dao.UpdateTaskState(taskId, DA.TaskState.Waiting, slaveId, userId, exception);
+        }
+
+        //dtoDao.UpdateTaskAndPluginsDA(task); no idea why this is needed
+        return DT.Convert.ToDto(task);
       });
     }
@@ -217 +224 @@
     public IEnumerable<Task> GetTasksByResourceId(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      var tasks = trans.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
+      var tasks = trans.UseTransaction(() => dtoDao.GetJobsByResourceId(resourceId));
       foreach (var task in tasks)
         author.AuthorizeForTask(task.Id, Permission.Read);
@@ -229 +236 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        var task = dao.GetTask(taskId);
+        var task = dtoDao.GetTask(taskId);
         if (task.State == TaskState.Calculating || task.State == TaskState.Transferring) {
           task.Command = Command.Stop;
-          dao.UpdateTask(task);
+          dtoDao.UpdateTask(task);
         } else {
           if (task.State != TaskState.Aborted && task.State != TaskState.Finished && task.State != TaskState.Failed) {
@@ -245 +252 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        var job = dao.GetTask(taskId);
+        var job = dtoDao.GetTask(taskId);
         if (job.State == TaskState.Calculating || job.State == TaskState.Transferring) {
           job.Command = Command.Pause;
-          dao.UpdateTask(job);
+          dtoDao.UpdateTask(job);
         } else {
           job = UpdateTaskState(taskId, TaskState.Paused, null, null, string.Empty);
@@ -259 +266 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        Task task = dao.UpdateTaskState(taskId, DA.TaskState.Waiting, null, userManager.CurrentUserId, string.Empty);
+        Task task = dtoDao.UpdateTaskState(taskId, DA.TaskState.Waiting, null, userManager.CurrentUserId, string.Empty);
         task.Command = null;
-        dao.UpdateTask(task);
+        dtoDao.UpdateTask(task);
       });
     }
@@ -271 +278 @@
       author.AuthorizeForJob(id, Permission.Read);
       return trans.UseTransaction(() => {
-        var job = dao.GetJobs(x =>
+        var job = dtoDao.GetJobs(x =>
               x.JobId == id
               && (x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0)
             ).FirstOrDefault();
         if (job != null) {
-          job.Permission = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+          job.Permission = DT.Convert.ToDto(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
           job.OwnerUsername = userManager.GetUserById(job.OwnerUserId).UserName;
         }
@@ -286 +293 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        var jobs = dao.GetJobs(x => x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0);
+        var jobs = dtoDao.GetJobs(x => x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0);
         foreach (var job in jobs) {
           author.AuthorizeForJob(job.Id, Permission.Read);
-          job.Permission = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+          job.Permission = DT.Convert.ToDto(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
           job.OwnerUsername = userManager.GetUserById(job.OwnerUserId).UserName;
         }
@@ -299 +306 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       return trans.UseTransaction(() => {
-        var jobs = dao.GetJobs(x => true);
+        var jobs = dtoDao.GetJobs(x => true);
         foreach (var job in jobs) { // no authorization here, since this method is admin-only! (admin is allowed to read all task)
-          job.Permission = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+          job.Permission = DT.Convert.ToDto(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
           job.OwnerUsername = userManager.GetUserById(job.OwnerUserId).UserName;
         }
@@ -313 +320 @@
         jobDto.OwnerUserId = userManager.CurrentUserId;
         jobDto.DateCreated = DateTime.Now;
-        return dao.AddJob(jobDto);
+        return dtoDao.AddJob(jobDto);
       });
     }
@@ -321 +328 @@
       author.AuthorizeForJob(jobDto.Id, Permission.Full);
       trans.UseTransaction(() => {
-        dao.UpdateJob(jobDto);
+        dtoDao.UpdateJob(jobDto);
       });
     }
@@ -329 +336 @@
       author.AuthorizeForJob(jobId, Permission.Full);
       trans.UseTransaction(() => {
-        dao.DeleteJob(jobId); // child task will be deleted by db-trigger
+        dtoDao.DeleteJob(jobId); // child task will be deleted by db-trigger
       });
     }
@@ -338 +345 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Job job = dao.GetJob(jobId);
+        Job job = dtoDao.GetJob(jobId);
         if (job == null) throw new FaultException<FaultReason>(new FaultReason("Could not find task with id " + jobId));
-        Permission perm = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+        Permission perm = DT.Convert.ToDto(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
         if (perm != Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permissions for this experiment"));
-        dao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DT.Convert.ToEntity(permission));
+        dtoDao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DT.Convert.ToEntity(permission));
       });
     }
@@ -349 +356 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Job job = dao.GetJob(jobId);
+        Job job = dtoDao.GetJob(jobId);
         if (job == null) throw new FaultException<FaultReason>(new FaultReason("Could not find task with id " + jobId));
-        DA.Permission perm = dao.GetPermissionForJob(job.Id, userManager.CurrentUserId);
+        DA.Permission perm = dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId);
         if (perm != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permissions for this experiment"));
-        dao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DA.Permission.NotAllowed);
+        dtoDao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DA.Permission.NotAllowed);
       });
     }
@@ -360 +367 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        DA.Permission currentUserPermission = dao.GetPermissionForJob(jobId, userManager.CurrentUserId);
+        DA.Permission currentUserPermission = dtoDao.GetPermissionForJob(jobId, userManager.CurrentUserId);
         if (currentUserPermission != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to list permissions for this experiment"));
-        return dao.GetJobPermissions(x => x.JobId == jobId);
+        return dtoDao.GetJobPermissions(x => x.JobId == jobId);
       });
     }
@@ -379 +386 @@
 
       trans.UseTransaction(() => {
-        var slave = dao.GetSlave(slaveInfo.Id);
+        var slave = dtoDao.GetSlave(slaveInfo.Id);
 
         if (slave == null) {
-          var healGroup = dao.GetResources(x => x.Name == "HEAL").First();
+          var healGroup = dtoDao.GetResources(x => x.Name == "HEAL").First();
           if (healGroup != null) {
             slaveInfo.ParentResourceId = healGroup.Id;
           }
-          dao.AddSlave(slaveInfo);
+          dtoDao.AddSlave(slaveInfo);
         } else {
           slave.Name = slaveInfo.Name;
@@ -405 +412 @@
           // don't update those properties: dbSlave.IsAllowedToCalculate, dbSlave.ParentResourceId 
 
-          dao.UpdateSlave(slave);
+          dtoDao.UpdateSlave(slave);
         }
       });
@@ -413 +420 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
       trans.UseTransaction(() => {
-        var slave = dao.GetSlave(slaveId);
+        var slave = dtoDao.GetSlave(slaveId);
         if (slave != null) {
           slave.SlaveState = SlaveState.Offline;
-          dao.UpdateSlave(slave);
+          dtoDao.UpdateSlave(slave);
         }
       });
@@ -449 +456 @@
         plugin.DateCreated = DateTime.Now;
 
-        var existing = dao.GetPlugins(x => x.Hash != null).Where(x => x.Hash.SequenceEqual(plugin.Hash));
+        var existing = dtoDao.GetPlugins(x => x.Hash != null).Where(x => x.Hash.SequenceEqual(plugin.Hash));
         if (existing.Count() > 0) {
           // a plugin already exists.
@@ -455 +462 @@
         }
 
-        Guid pluginId = dao.AddPlugin(plugin);
+        Guid pluginId = dtoDao.AddPlugin(plugin);
         foreach (PluginData pluginData in pluginDatas) {
           pluginData.PluginId = pluginId;
-          dao.AddPluginData(pluginData);
+          dtoDao.AddPluginData(pluginData);
         }
         return pluginId;
@@ -467 +474 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       return trans.UseTransaction(() => {
-        return dao.GetPlugin(pluginId);
+        return dtoDao.GetPlugin(pluginId);
       });
     }
@@ -474 +481 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       return trans.UseTransaction(() => {
-        return dao.GetPlugins(x => x.Hash == hash).FirstOrDefault();
+        return dtoDao.GetPlugins(x => x.Hash == hash).FirstOrDefault();
       });
     }
@@ -483 +490 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       return trans.UseTransaction(() => {
-        return dao.GetPlugins(x => x.Hash != null);
+        return dtoDao.GetPlugins(x => x.Hash != null);
       });
     }
@@ -492 +499 @@
       return trans.UseTransaction(() => {
         foreach (Guid guid in pluginIds) {
-          pluginDatas.AddRange(dao.GetPluginDatas(x => x.PluginId == guid).ToList());
+          pluginDatas.AddRange(dtoDao.GetPluginDatas(x => x.PluginId == guid).ToList());
         }
         return pluginDatas;
@@ -501 +508 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       trans.UseTransaction(() => {
-        dao.DeletePlugin(pluginId);
+        dtoDao.DeletePlugin(pluginId);
       });
     }
@@ -510 +517 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Resource resource = dao.GetResource(resourceId);
+        Resource resource = dtoDao.GetResource(resourceId);
         if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
         if (resource.OwnerUserId != userManager.CurrentUserId && !authen.IsInRole(HiveRoles.Administrator)) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permission for this resource"));
         foreach (Guid id in grantedUserIds)
-          dao.AddResourcePermission(new ResourcePermission { ResourceId = resourceId, GrantedByUserId = userManager.CurrentUserId, GrantedUserId = id });
+          dtoDao.AddResourcePermission(new ResourcePermission { ResourceId = resourceId, GrantedByUserId = userManager.CurrentUserId, GrantedUserId = id });
       });
     }
@@ -521 +528 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Resource resource = dao.GetResource(resourceId);
+        Resource resource = dtoDao.GetResource(resourceId);
         if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
         if (resource.OwnerUserId != userManager.CurrentUserId && !authen.IsInRole(HiveRoles.Administrator)) throw new FaultException<FaultReason>(new FaultReason("Not allowed to revoke permission for this resource"));
         foreach (Guid id in grantedUserIds)
-          dao.DeleteResourcePermission(resourceId, id);
+          dtoDao.DeleteResourcePermission(resourceId, id);
       });
     }
@@ -532 +539 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        Resource resource = dao.GetResource(resourceId);
+        Resource resource = dtoDao.GetResource(resourceId);
         if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
-        return dao.GetResourcePermissions(x => x.ResourceId == resourceId);
+        return dtoDao.GetResourcePermissions(x => x.ResourceId == resourceId);
       });
     }
@@ -541 +548 @@
     #region Resource Methods
     public IEnumerable<Resource> GetChildResources(Guid resourceId) {
-      return trans.UseTransaction(() => { return dao.GetChildResources(resourceId); });
+      return trans.UseTransaction(() => { return dtoDao.GetChildResources(resourceId); });
     }
     #endregion
@@ -549 +556 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
 
-      Slave s = trans.UseTransaction(() => { return dao.GetSlave(slaveId); });
+      Slave s = trans.UseTransaction(() => { return dtoDao.GetSlave(slaveId); });
       if (s != null) {
         return s.HbInterval;
@@ -559 +566 @@
     public Guid AddSlave(Slave slave) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => dao.AddSlave(slave));
+      return trans.UseTransaction(() => dtoDao.AddSlave(slave));
     }
 
     public Guid AddSlaveGroup(SlaveGroup slaveGroup) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
+      return trans.UseTransaction(() => dtoDao.AddSlaveGroup(slaveGroup));
     }
 
     public Slave GetSlave(Guid slaveId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => { return dao.GetSlave(slaveId); });
+      return trans.UseTransaction(() => { return dtoDao.GetSlave(slaveId); });
     }
 
     public SlaveGroup GetSlaveGroup(Guid slaveGroupId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => { return dao.GetSlaveGroup(slaveGroupId); });
+      return trans.UseTransaction(() => { return dtoDao.GetSlaveGroup(slaveGroupId); });
     }
 
@@ -580 +587 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        return dao.GetSlaves(x => true).Where(x => x.OwnerUserId == null
+        return dtoDao.GetSlaves(x => true).Where(x => x.OwnerUserId == null
                                            || x.OwnerUserId == userManager.CurrentUserId
                                            || userManager.VerifyUser(userManager.CurrentUserId, GetResourcePermissions(x.Id).Select(y => y.GrantedUserId).ToList())
@@ -590 +597 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        return dao.GetSlaveGroups(x => true).Where(x => x.OwnerUserId == null
+        return dtoDao.GetSlaveGroups(x => true).Where(x => x.OwnerUserId == null
                                                 || x.OwnerUserId == userManager.CurrentUserId
                                                 || userManager.VerifyUser(userManager.CurrentUserId, GetResourcePermissions(x.Id).Select(y => y.GrantedUserId).ToList())
@@ -600 +607 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        dao.UpdateSlave(slave);
+        dtoDao.UpdateSlave(slave);
       });
     }
@@ -607 +614 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        dao.UpdateSlaveGroup(slaveGroup);
+        dtoDao.UpdateSlaveGroup(slaveGroup);
       });
     }
@@ -615 +622 @@
       author.AuthorizeForResourceAdministration(slaveId);
       trans.UseTransaction(() => {
-        dao.DeleteSlave(slaveId);
+        dtoDao.DeleteSlave(slaveId);
       });
     }
@@ -623 +630 @@
       author.AuthorizeForResourceAdministration(slaveGroupId);
       trans.UseTransaction(() => {
-        dao.DeleteSlaveGroup(slaveGroupId);
+        dtoDao.DeleteSlaveGroup(slaveGroupId);
       });
     }
@@ -630 +637 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       trans.UseTransaction(() => {
-        var resource = dao.GetResource(resourceId);
+        var resource = dtoDao.GetResource(resourceId);
         resource.ParentResourceId = slaveGroupId;
-        dao.UpdateResource(resource);
+        dtoDao.UpdateResource(resource);
       });
     }
@@ -639 +646 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       trans.UseTransaction(() => {
-        var resource = dao.GetResource(resourceId);
+        var resource = dtoDao.GetResource(resourceId);
         resource.ParentResourceId = null;
-        dao.UpdateResource(resource);
+        dtoDao.UpdateResource(resource);
       });
     }
@@ -648 +655 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        var resource = dao.GetResources(x => x.Name == resourceName).FirstOrDefault();
+        var resource = dtoDao.GetResources(x => x.Name == resourceName).FirstOrDefault();
         if (resource != null) {
           return resource.Id;
@@ -662 +669 @@
       bool cleanup = false;
       trans.UseTransaction(() => {
-        DateTime lastCleanup = dao.GetLastCleanup();
+        DateTime lastCleanup = dtoDao.GetLastCleanup();
         if (force || DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
-          dao.SetLastCleanup(DateTime.Now);
+          dtoDao.SetLastCleanup(DateTime.Now);
           cleanup = true;
         }
@@ -679 +686 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       author.AuthorizeForResourceAdministration(downtime.ResourceId);
-      return trans.UseTransaction(() => dao.AddDowntime(downtime));
+      return trans.UseTransaction(() => dtoDao.AddDowntime(downtime));
     }
 
@@ -687 +694 @@
       // author.AuthorizeForResource(resourceId);
       trans.UseTransaction(() => {
-        dao.DeleteDowntime(downtimeId);
+        dtoDao.DeleteDowntime(downtimeId);
       });
     }
@@ -695 +702 @@
       author.AuthorizeForResourceAdministration(downtime.ResourceId);
       trans.UseTransaction(() => {
-        dao.UpdateDowntime(downtime);
+        dtoDao.UpdateDowntime(downtime);
       });
     }
@@ -701 +708 @@
     public IEnumerable<Downtime> GetDowntimesForResource(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => dao.GetDowntimes(x => x.ResourceId == resourceId));
+      return trans.UseTransaction(() => dtoDao.GetDowntimes(x => x.ResourceId == resourceId));
     }
     #endregion
@@ -724 +731 @@
     #region UserPriority Methods
     public IEnumerable<UserPriority> GetUserPriorities() {
-      return trans.UseTransaction(() => dao.GetUserPriorities(x => true));
+      return trans.UseTransaction(() => dtoDao.GetUserPriorities(x => true));
     }
     #endregion
@@ -730 +737 @@
     #region Helper Methods
     private IEnumerable<Task> GetChildTasks(Guid? parentTaskId, bool recursive, bool includeParent) {
-      var tasks = new List<Task>(dao.GetTasks(x => parentTaskId == null ? !x.ParentTaskId.HasValue : x.ParentTaskId.Value == parentTaskId));
+      var tasks = new List<Task>(dtoDao.GetTasks(x => parentTaskId == null ? !x.ParentTaskId.HasValue : x.ParentTaskId.Value == parentTaskId));
 
       if (recursive) {
@@ -747 +754 @@
     #region Statistics Methods
     public IEnumerable<Statistics> GetStatistics() {
-      return trans.UseTransaction(() => { return dao.GetStatistics(x => true); });
+      return trans.UseTransaction(() => { return dtoDao.GetStatistics(x => true); });
     }
     public IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to) {
-      return trans.UseTransaction(() => { return dao.GetStatistics(x => x.Timestamp >= from && x.Timestamp <= to); });
+      return trans.UseTransaction(() => { return dtoDao.GetStatistics(x => x.Timestamp >= from && x.Timestamp <= to); });
     }
     #endregion

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDtoDao.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.Hive.DataAccess;
@@ -28 +27 @@
 
 namespace HeuristicLab.Services.Hive {
-  public interface IHiveDao {
+  public interface IHiveDtoDao {
     #region Task Methods
     DT.Task GetTask(Guid id);
-    Task GetTaskDA(Guid id);
     IEnumerable<DT.Task> GetTasks(Expression<Func<Task, bool>> predicate);
     IEnumerable<DT.LightweightTask> GetLightweightTasks(Expression<Func<Task, bool>> predicate);
@@ -39 +37 @@
     void UpdateTaskAndStateLogs(DT.Task dto);
     void UpdateTask(DT.Task dto);
-    void UpdateTaskDA(Task dto);
     void DeleteTask(Guid id);
     IEnumerable<TaskInfoForScheduler> GetWaitingTasks(DT.Slave slave);
-    IQueryable<TaskInfoForScheduler> GetWaitingTasksDA(Slave slave);
     IEnumerable<DT.Task> GetParentTasks(IEnumerable<Guid> resourceIds, int count, bool finished);
     DT.Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception);
-    Task UpdateTaskStateDA(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception);
     #endregion
 
@@ -100 +95 @@
     #region Slave Methods
     DT.Slave GetSlave(Guid id);
-    Slave GetSlaveDA(Guid id);
     IEnumerable<DT.Slave> GetSlaves(Expression<Func<Slave, bool>> predicate);
     Guid AddSlave(DT.Slave dto);
     void UpdateSlave(DT.Slave dto);
-    void UpdateSlaveDA(Slave dto);
     void DeleteSlave(Guid id);
     #endregion
@@ -124 +117 @@
     void AssignJobToResource(Guid taskId, IEnumerable<Guid> resourceIds);
     IEnumerable<DT.Resource> GetAssignedResources(Guid jobId);
-    IQueryable<Guid> GetAssignedResourcesIdsDA(Guid taskId);
     IEnumerable<DT.Resource> GetParentResources(Guid resourceId);
-    IEnumerable<Resource> GetParentResourcesDA(Guid resourceId);
-    IEnumerable<Guid> GetParentResourcesIDsDA(Guid resourceId);
-    IQueryable<int> GetNumberOfDowntimesFromParentResourcesAtCurrentTimeDA(Guid resourceId, DowntimeType type);
     IEnumerable<DT.Resource> GetChildResources(Guid resourceId);
     IEnumerable<DT.Task> GetJobsByResourceId(Guid resourceId);

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs

@@ -26 +26 @@
     Access.IRoleVerifier RoleVerifier { get; }
     IAuthorizationManager AuthorizationManager { get; }
+    IHiveDtoDao HiveDtoDao { get; }
     IHiveDao HiveDao { get; }
     IEventManager EventManager { get; }

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

@@ -36 +36 @@
       if (ServiceLocator.Instance.RoleVerifier.IsInRole(HiveRoles.Slave)) return; // slave-users can access all tasks
 
-      Permission permission = ServiceLocator.Instance.HiveDao.GetPermissionForTask(taskId, ServiceLocator.Instance.UserManager.CurrentUserId);
+      Permission permission = ServiceLocator.Instance.HiveDtoDao.GetPermissionForTask(taskId, ServiceLocator.Instance.UserManager.CurrentUserId);
       if (permission == Permission.NotAllowed || (permission != DT.Convert.ToEntity(requiredPermission) && DT.Convert.ToEntity(requiredPermission) == Permission.Full))
         throw new SecurityException("Current user is not authorized to access task");
@@ -42 +42 @@
 
     public void AuthorizeForJob(Guid jobId, DT.Permission requiredPermission) {
-      Permission permission = ServiceLocator.Instance.HiveDao.GetPermissionForJob(jobId, ServiceLocator.Instance.UserManager.CurrentUserId);
+      Permission permission = ServiceLocator.Instance.HiveDtoDao.GetPermissionForJob(jobId, ServiceLocator.Instance.UserManager.CurrentUserId);
       if (permission == Permission.NotAllowed || (permission != DT.Convert.ToEntity(requiredPermission) && DT.Convert.ToEntity(requiredPermission) == Permission.Full))
         throw new SecurityException("Current user is not authorized to access task");
@@ -48 +48 @@
 
     public void AuthorizeForResourceAdministration(Guid resourceId) {
-      Resource resource = DT.Convert.ToEntity(ServiceLocator.Instance.HiveDao.GetResource(resourceId));
+      Resource resource = DT.Convert.ToEntity(ServiceLocator.Instance.HiveDtoDao.GetResource(resourceId));
       if (resource.OwnerUserId != ServiceLocator.Instance.UserManager.CurrentUserId && !ServiceLocator.Instance.RoleVerifier.IsInRole(HiveRoles.Administrator))
         throw new SecurityException("Current user is not authorized to access resource");

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -32 +32 @@
   /// </summary>
   public class EventManager : IEventManager {
-    private IHiveDao dao {
-      get { return ServiceLocator.Instance.HiveDao; }
+    private IHiveDtoDao dao {
+      get { return ServiceLocator.Instance.HiveDtoDao; }
     }
     private IAuthorizationManager auth {
@@ -78 +78 @@
       //we have to find another way to deal with this.  
       //until then the next line is commented out...
-      //stats.UserStatistics = dao.GetUserStatistics();
+      //stats.UserStatistics = dtoDao.GetUserStatistics();
       dao.AddStatistics(stats);
     }

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Threading;
-using HeuristicLab.Services.Hive.DataTransfer;
-using DA = HeuristicLab.Services.Hive.DataAccess;
+using HeuristicLab.Services.Hive.DataAccess;
+using Heartbeat = HeuristicLab.Services.Hive.DataTransfer.Heartbeat;
 
 namespace HeuristicLab.Services.Hive {
@@ -48 +48 @@
       List<MessageContainer> actions = new List<MessageContainer>();
 
-      DA.Slave slave = null;
+      Slave slave = null;
       trans.UseTransaction(() => {
-        slave = dao.GetSlaveDA(heartbeat.SlaveId);
+        slave = dao.GetSlaveById(heartbeat.SlaveId);
 
         if (slave == null) {
@@ -67 +67 @@
           slave.CpuUtilization = heartbeat.CpuUtilization;
           slave.IsAllowedToCalculate = SlaveIsAllowedToCalculate(slave.ResourceId);
-          slave.SlaveState = (heartbeat.JobProgress != null && heartbeat.JobProgress.Count > 0) ? DA.SlaveState.Calculating : DA.SlaveState.Idle;
+          slave.SlaveState = (heartbeat.JobProgress != null && heartbeat.JobProgress.Count > 0) ? SlaveState.Calculating : SlaveState.Idle;
           slave.LastHeartbeat = DateTime.Now;
 
-          dao.UpdateSlaveDA(slave);
+          dao.UpdateSlave(slave);
         }
       });
@@ -86 +86 @@
             mutexAquired = mutex.WaitOne(Properties.Settings.Default.SchedulingPatience);
             if (!mutexAquired)
-              DA.LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager: The mutex used for scheduling could not be aquired.");
+              LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager: The mutex used for scheduling could not be aquired.");
             else {
               trans.UseTransaction(() => {
                 IEnumerable<TaskInfoForScheduler> availableTasks = null;
-                availableTasks = taskScheduler.Schedule(dao.GetWaitingTasksDA(slave).ToArray());
+                availableTasks = taskScheduler.Schedule(dao.GetWaitingTasks(slave).ToArray());
                 if (availableTasks.Any()) {
                   var task = availableTasks.First();
@@ -100 +100 @@
           }
           catch (AbandonedMutexException) {
-            DA.LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager: The mutex used for scheduling has been abandoned.");
+            LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager: The mutex used for scheduling has been abandoned.");
           }
           catch (Exception ex) {
-            DA.LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager threw an exception in ProcessHeartbeat: " + ex.ToString());
+            LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager threw an exception in ProcessHeartbeat: " + ex.ToString());
           }
           finally {
@@ -113 +113 @@
     }
 
-    private void AssignJob(DA.Slave slave, Guid taskId) {
-      var task = dao.UpdateTaskStateDA(taskId, DataAccess.TaskState.Transferring, slave.ResourceId, null, null);
+    private void AssignJob(Slave slave, Guid taskId) {
+      var task = dao.UpdateTaskState(taskId, DataAccess.TaskState.Transferring, slave.ResourceId, null, null);
 
       // from now on the task has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)
       task.LastHeartbeat = DateTime.Now;
-      dao.UpdateTaskDA(task);
+      dao.UpdateTask(task);
     }
 
@@ -137 +137 @@
         foreach (var jobProgress in heartbeat.JobProgress) {
           trans.UseTransaction(() => {
-            var curTask = dao.GetTaskDA(jobProgress.Key);
+            var curTask = dao.GetTaskById(jobProgress.Key);
             if (curTask == null) {
               // task does not exist in db
               actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, jobProgress.Key));
-              DA.LogFactory.GetLogger(this.GetType().Namespace).Log("Task on slave " + heartbeat.SlaveId + " does not exist in DB: " + jobProgress.Key);
+              LogFactory.GetLogger(this.GetType().Namespace).Log("Task on slave " + heartbeat.SlaveId + " does not exist in DB: " + jobProgress.Key);
             } else {
               var currentStateLog = curTask.StateLogs.Last();
@@ -147 +147 @@
                 // assigned slave does not match heartbeat
                 actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.TaskId));
-                DA.LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate task: " + curTask);
+                LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate task: " + curTask);
               } else if (!TaskIsAllowedToBeCalculatedBySlave(heartbeat.SlaveId, curTask)) {
                 // assigned resources ids of task do not match with slaveId (and parent resourceGroupIds); this might happen when slave is moved to different group
@@ -157 +157 @@
 
                 switch (curTask.Command) {
-                  case DA.Command.Stop:
+                  case Command.Stop:
                     actions.Add(new MessageContainer(MessageContainer.MessageType.StopTask, curTask.TaskId));
                     break;
-                  case DA.Command.Pause:
+                  case Command.Pause:
                     actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.TaskId));
                     break;
-                  case DA.Command.Abort:
+                  case Command.Abort:
                     actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.TaskId));
                     break;
                 }
-                dao.UpdateTaskDA(curTask);
+                dao.UpdateTask(curTask);
               }
             }
@@ -176 +176 @@
     }
 
-    private bool TaskIsAllowedToBeCalculatedBySlave(Guid slaveId, DA.Task curTask) {
-      var assignedResourceIds = dao.GetAssignedResourcesIdsDA(curTask.TaskId);
-      var slaveResourceIds = dao.GetParentResourcesIDsDA(slaveId).ToArray();
+    private bool TaskIsAllowedToBeCalculatedBySlave(Guid slaveId, Task curTask) {
+      var assignedResourceIds = dao.GetAssignedResourcesIds(curTask.TaskId);
+      var slaveResourceIds = dao.GetParentResourcesIDs(slaveId).ToArray();
       return assignedResourceIds.Any(r => slaveResourceIds.Contains(r));
     }
 
     private bool SlaveIsAllowedToCalculate(Guid slaveId) {
-      var downtimes = dao.GetNumberOfDowntimesFromParentResourcesAtCurrentTimeDA(slaveId, DA.DowntimeType.Offline);
+      var downtimes = dao.GetNumberOfDowntimesFromParentResourcesAtCurrentTime(slaveId, DowntimeType.Offline);
       // the slave may only calculate if there is no downtime right now. this needs to be checked for every parent resource also
       return downtimes.All(x => x == 0);
@@ -189 +189 @@
 
     private bool ShutdownSlaveComputer(Guid slaveId) {
-      var downtimes = dao.GetNumberOfDowntimesFromParentResourcesAtCurrentTimeDA(slaveId, DA.DowntimeType.Shutdown);
+      var downtimes = dao.GetNumberOfDowntimesFromParentResourcesAtCurrentTime(slaveId, DowntimeType.Shutdown);
       return downtimes.Any(x => x != 0);
     }

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs

@@ -27 +27 @@
 namespace HeuristicLab.Services.Hive {
   public class RoundRobinTaskScheduler : ITaskScheduler {
-    private IHiveDao dao {
-      get { return ServiceLocator.Instance.HiveDao; }
+    private IHiveDtoDao dao {
+      get { return ServiceLocator.Instance.HiveDtoDao; }
     }
 

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

@@ -32 +32 @@
       }
       set { instance = value; }
+    }
+
+    private IHiveDtoDao hiveDtoDao;
+    public IHiveDtoDao HiveDtoDao {
+      get {
+        if (hiveDtoDao == null) hiveDtoDao = new HiveDtoDao();
+        return hiveDtoDao;
+      }
     }
 

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