Changeset 9434

Timestamp:

05/03/13 13:47:27 (12 years ago)

Author:

pfleck

Message:

#2030
Added SelfHost-Project
Renamed HiveDtoDao back to HiveDao and renamed the optimized HiveDao into OptimizedDao instead.
Optimized AddTask by using compiled queries.

Location:

branches/HivePerformance/sources

Files:

• HeuristicLab 3.3 Services.sln (modified) (4 diffs)
• HeuristicLab.Services.Hive.SelfHost (added)
• HeuristicLab.Services.Hive.SelfHost/3.3 (added)
• HeuristicLab.Services.Hive.SelfHost/3.3/App.config (added)
• HeuristicLab.Services.Hive.SelfHost/3.3/HeuristicLab.Services.Hive.SelfHost-3.3.csproj (added)
• HeuristicLab.Services.Hive.SelfHost/3.3/Program.cs (added)
• HeuristicLab.Services.Hive.SelfHost/3.3/Properties (added)
• HeuristicLab.Services.Hive.SelfHost/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (moved) (moved from branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveDtoDao.cs) (2 diffs)
• HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveOperationContext.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (61 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (moved) (moved from branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDtoDao.cs) (1 diff)
• HeuristicLab.Services.Hive/3.3/Interfaces/IOptimizedHiveDao.cs (copied) (copied from branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs) (3 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) (1 diff)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/OptimizedHiveDao.cs (copied) (copied from branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs) (10 diffs)
• HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (2 diffs)

branches/HivePerformance/sources/HeuristicLab 3.3 Services.sln

@@ -1 +1 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
   ProjectSection(SolutionItems) = preProject
@@ -24 +24 @@
   ProjectSection(WebsiteProperties) = preProject
     TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
-    ProjectReferences = "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}|HeuristicLab.Services.Hive-3.3.dll;{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}|HeuristicLab.Services.Hive.DataAccess-3.3.dll;"
+    ProjectReferences = "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}|HeuristicLab.Services.Hive-3.3.dll;{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}|HeuristicLab.Services.Hive.DataAccess-3.3.dll;{9FAC0B23-2730-452A-9BA0-D7CA1746C541}|HeuristicLab.Services.Access.dll;{BE9B0229-9150-49A4-AEA6-BB58E055992F}|HeuristicLab.GeoIP.dll;{0F652437-998A-4EAB-8BF1-444B5FE8CE97}|HeuristicLab.Services.Access.DataAccess.dll;"
     Debug.AspNetCompiler.VirtualPath = "/Hive-3.3"
     Debug.AspNetCompiler.PhysicalPath = "HeuristicLab.Services.Hive.Web\Hive-3.3\"
@@ -57 +57 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.OKB-3.3", "HeuristicLab.Services.OKB\3.3\HeuristicLab.Services.OKB-3.3.csproj", "{766DA4B7-2A0E-4CDE-8F90-93D8B1AD62CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.SelfHost-3.3", "HeuristicLab.Services.Hive.SelfHost\3.3\HeuristicLab.Services.Hive.SelfHost-3.3.csproj", "{DAACE3EB-5D88-419D-9EEC-5707E273491A}"
 EndProject
 Global
@@ -222 +224 @@
     {766DA4B7-2A0E-4CDE-8F90-93D8B1AD62CF}.Release|x86.ActiveCfg = Release|x86
     {766DA4B7-2A0E-4CDE-8F90-93D8B1AD62CF}.Release|x86.Build.0 = Release|x86
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Release|x64.ActiveCfg = Release|Any CPU
+    {DAACE3EB-5D88-419D-9EEC-5707E273491A}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

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.HiveDtoDao;
+    var dao = ServiceLocator.Instance.HiveDao;
     var transactionManager = ServiceLocator.Instance.TransactionManager;
     var resourceName = Request.QueryString["resource"];

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

@@ -103 +103 @@
     public static DT.TaskData ToDto(DB.TaskData source) {
       if (source == null) return null;
-      return new DT.TaskData { TaskId = source.TaskId, Data = source.Data.ToArray(), LastUpdate = source.LastUpdate };
+      return new DT.TaskData { TaskId = source.TaskId, Data = source.Data, LastUpdate = source.LastUpdate };
     }
     public static DB.TaskData ToEntity(DT.TaskData source) {

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

@@ -137 +137 @@
     <Compile Include="DataTransfer\Statistics.cs" />
     <Compile Include="DataTransfer\UserStatistics.cs" />
+    <Compile Include="OptimizedHiveDao.cs" />
     <Compile Include="HiveDao.cs" />
-    <Compile Include="HiveDtoDao.cs" />
     <Compile Include="HiveJanitor.cs" />
     <Compile Include="HiveOperationContext.cs" />
+    <Compile Include="Interfaces\IOptimizedHiveDao.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/HiveDao.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive.DataAccess {
-  public class HiveDtoDao : IHiveDtoDao {
+  public class HiveDao : IHiveDao {
     public static HiveDataContext CreateContext(bool longRunning = false) {
       var context = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
@@ -33 +33 @@
       return context;
     }
-
-    public HiveDtoDao() { }
 
     #region Task Methods

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

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

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

@@ -22 +22 @@
 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;
 
 namespace HeuristicLab.Services.Hive {
   public class HiveOperationContext : IExtension<OperationContext> {
+
     public static HiveOperationContext Current {
       get {
@@ -42 +40 @@
     public HiveDataContext DataContext {
       get {
-        if (dataContext == null) {
-          dataContext = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
-          //dataContext.Log = new DebugWriter();
-        }
-        return dataContext;
+        return dataContext ?? (dataContext = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString));
       }
     }
@@ -67 +61 @@
     }
 
-    public void BeforeSendReply(ref System.ServiceModel.Channels.Message reply, object correlationState) {
+    public void BeforeSendReply(ref Message reply, object correlationState) {
       OperationContext.Current.Extensions.Remove(HiveOperationContext.Current);
     }
@@ -88 +82 @@
     }
   }
-
-  internal class DebugWriter : TextWriter {
-    public override Encoding Encoding {
-      get { return Encoding.UTF8; }
-    }
-
-    public override void Write(char value) {
-      Debug.Write(value);
-    }
-
-    public override void Write(string value) {
-      Debug.Write(value);
-    }
-
-    public override void WriteLine(string value) {
-      Debug.WriteLine(value);
-    }
-  }
 }

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

@@ -39 +39 @@
   [HiveOperationContextBehavior]
   public class HiveService : IHiveService {
-    private IHiveDtoDao dtoDao {
-      get { return ServiceLocator.Instance.HiveDtoDao; }
-    }
     private IHiveDao dao {
       get { return ServiceLocator.Instance.HiveDao; }
     }
+    private IOptimizedHiveDao optimizedDao {
+      get { return ServiceLocator.Instance.OptimizedHiveDao; }
+    }
     private Access.IRoleVerifier authen {
       get { return ServiceLocator.Instance.RoleVerifier; }
@@ -68 +68 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        task.Id = dtoDao.AddTask(task);
-        taskData.TaskId = task.Id;
-        taskData.LastUpdate = DateTime.Now;
-        dtoDao.AssignJobToResource(task.Id, resourceIds);
-        dtoDao.AddTaskData(taskData);
-        dtoDao.UpdateTaskState(task.Id, DA.TaskState.Waiting, null, userManager.CurrentUserId, null);
-        return taskData.TaskId;
+        var t = DT.Convert.ToEntity(task);
+        t.RequiredPlugins.AddRange(task.PluginsNeededIds.Select(pluginId => new DA.RequiredPlugin { Task = t, PluginId = pluginId }));
+
+        t.JobData = DT.Convert.ToEntity(taskData);
+        t.JobData.LastUpdate = DateTime.Now;
+
+        optimizedDao.AddTask(t);
+
+        dao.AssignJobToResource(t.TaskId, resourceIds);
+
+        optimizedDao.UpdateTaskState(t.TaskId, DA.TaskState.Waiting, null, userManager.CurrentUserId, null);
+
+        return t.TaskId;
       }, false, true);
     }
@@ -80 +86 @@
     public Guid AddChildTask(Guid parentTaskId, Task task, TaskData taskData) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
-        task.ParentTaskId = parentTaskId;
-        return AddTask(task, taskData, dtoDao.GetAssignedResources(parentTaskId).Select(x => x.Id));
-      }, false, true);
+      task.ParentTaskId = parentTaskId;
+      return AddTask(task, taskData, optimizedDao.GetAssignedResourceIds(parentTaskId));
     }
 
@@ -91 +95 @@
 
       return trans.UseTransaction(() => {
-        return DT.Convert.ToDto(dao.GetTaskById(taskId));
+        return DT.Convert.ToDto(optimizedDao.GetTaskById(taskId));
       }, false, false);
     }
@@ -98 +102 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        var tasks = dtoDao.GetTasks(x => true);
+        var tasks = dao.GetTasks(x => true);
         foreach (var task in tasks)
           author.AuthorizeForTask(task.Id, Permission.Read);
@@ -109 +113 @@
 
       return trans.UseTransaction(() => {
-        var tasks = dtoDao.GetTasks(x => taskIds.Contains(x.TaskId)).Select(x => new LightweightTask(x)).ToArray();
+        var tasks = dao.GetTasks(x => taskIds.Contains(x.TaskId)).Select(x => new LightweightTask(x)).ToArray();
         foreach (var task in tasks)
           author.AuthorizeForTask(task.Id, Permission.Read);
@@ -132 +136 @@
 
       return trans.UseTransaction(() => {
-        return dao.GetLightweightTasks(jobId).ToArray();
+        return optimizedDao.GetLightweightTasks(jobId).ToArray();
       }, false, true);
     }
@@ -141 +145 @@
 
       return trans.UseTransaction(() => {
-        return dtoDao.GetLightweightTasksWithoutStateLog(task => task.JobId == jobId).ToArray();
+        return dao.GetLightweightTasksWithoutStateLog(task => task.JobId == jobId).ToArray();
       }, false, false);
     }
@@ -150 +154 @@
 
       return trans.UseTransaction(() => {
-        return dtoDao.GetTaskData(taskId);
+        return dao.GetTaskData(taskId);
       });
     }
@@ -159 +163 @@
 
       trans.UseTransaction(() => {
-        var task = dao.GetTaskByDto(taskDto);
-        dao.UpdateTask(task);
+        var task = optimizedDao.GetTaskByDto(taskDto);
+        optimizedDao.UpdateTask(task);
       });
     }
@@ -169 +173 @@
 
       trans.UseTransaction(() => {
-        var t = dao.GetTaskByDto(task);
-        dao.UpdateTask(t);
-      });
-
-      trans.UseTransaction(() => {
-        var data = dao.GetTaskDataByDto(taskData);
+        var t = optimizedDao.GetTaskByDto(task);
+        optimizedDao.UpdateTask(t);
+      });
+
+      trans.UseTransaction(() => {
+        var data = optimizedDao.GetTaskDataByDto(taskData);
         data.LastUpdate = DateTime.Now;
-        dao.UpdateTaskData(data);
+        optimizedDao.UpdateTaskData(data);
       });
     }
@@ -184 +188 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        dtoDao.DeleteTask(taskId);
+        dao.DeleteTask(taskId);
       });
     }
@@ -194 +198 @@
         var tasks = GetChildTasks(parentTaskId, true, false);
         foreach (var task in tasks) {
-          dtoDao.DeleteTask(task.Id);
-          dtoDao.DeleteTaskData(task.Id);
+          dao.DeleteTask(task.Id);
+          dao.DeleteTaskData(task.Id);
         };
       });
@@ -205 +209 @@
 
       return trans.UseTransaction(() => {
-        var task = dao.UpdateTaskState(taskId, DT.Convert.ToEntity(taskState), slaveId, userId, exception);
+        var task = optimizedDao.UpdateTaskState(taskId, DT.Convert.ToEntity(taskState), slaveId, userId, exception);
 
         if (task.Command.HasValue && task.Command.Value == DA.Command.Pause && task.State == DA.TaskState.Paused) {
@@ -215 +219 @@
         } else if (taskState == TaskState.Paused && !task.Command.HasValue) {
           // slave paused and uploaded the task (no user-command) -> set waiting.
-          task = dao.UpdateTaskState(taskId, DA.TaskState.Waiting, slaveId, userId, exception);
-        }
-
-        //dao.UpdateTaskAndPlugins(task); no idea why this is needed
+          task = optimizedDao.UpdateTaskState(taskId, DA.TaskState.Waiting, slaveId, userId, exception);
+        }
+
+        //optimizedDao.UpdateTaskAndPlugins(task); no idea why this is needed
         return DT.Convert.ToDto(task);
       });
@@ -225 +229 @@
     public IEnumerable<Task> GetTasksByResourceId(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      var tasks = trans.UseTransaction(() => dtoDao.GetJobsByResourceId(resourceId));
+      var tasks = trans.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
       foreach (var task in tasks)
         author.AuthorizeForTask(task.Id, Permission.Read);
@@ -237 +241 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        var task = dtoDao.GetTask(taskId);
+        var task = dao.GetTask(taskId);
         if (task.State == TaskState.Calculating || task.State == TaskState.Transferring) {
           task.Command = Command.Stop;
-          dtoDao.UpdateTask(task);
+          dao.UpdateTask(task);
         } else {
           if (task.State != TaskState.Aborted && task.State != TaskState.Finished && task.State != TaskState.Failed) {
@@ -253 +257 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        var job = dtoDao.GetTask(taskId);
+        var job = dao.GetTask(taskId);
         if (job.State == TaskState.Calculating || job.State == TaskState.Transferring) {
           job.Command = Command.Pause;
-          dtoDao.UpdateTask(job);
+          dao.UpdateTask(job);
         } else {
           job = UpdateTaskState(taskId, TaskState.Paused, null, null, string.Empty);
@@ -267 +271 @@
       author.AuthorizeForTask(taskId, Permission.Full);
       trans.UseTransaction(() => {
-        Task task = dtoDao.UpdateTaskState(taskId, DA.TaskState.Waiting, null, userManager.CurrentUserId, string.Empty);
+        Task task = dao.UpdateTaskState(taskId, DA.TaskState.Waiting, null, userManager.CurrentUserId, string.Empty);
         task.Command = null;
-        dtoDao.UpdateTask(task);
+        dao.UpdateTask(task);
       });
     }
@@ -279 +283 @@
       author.AuthorizeForJob(id, Permission.Read);
       return trans.UseTransaction(() => {
-        var job = dtoDao.GetJobs(x =>
+        var job = dao.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(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+          job.Permission = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
           job.OwnerUsername = userManager.GetUserById(job.OwnerUserId).UserName;
         }
@@ -294 +298 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        var jobs = dtoDao.GetJobs(x => x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0);
+        var jobs = dao.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(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+          job.Permission = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
           job.OwnerUsername = userManager.GetUserById(job.OwnerUserId).UserName;
         }
@@ -307 +311 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       return trans.UseTransaction(() => {
-        var jobs = dtoDao.GetJobs(x => true);
+        var jobs = dao.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(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+          job.Permission = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
           job.OwnerUsername = userManager.GetUserById(job.OwnerUserId).UserName;
         }
@@ -321 +325 @@
         jobDto.OwnerUserId = userManager.CurrentUserId;
         jobDto.DateCreated = DateTime.Now;
-        return dtoDao.AddJob(jobDto);
+        return dao.AddJob(jobDto);
       });
     }
@@ -329 +333 @@
       author.AuthorizeForJob(jobDto.Id, Permission.Full);
       trans.UseTransaction(() => {
-        dtoDao.UpdateJob(jobDto);
+        dao.UpdateJob(jobDto);
       });
     }
@@ -337 +341 @@
       author.AuthorizeForJob(jobId, Permission.Full);
       trans.UseTransaction(() => {
-        dtoDao.DeleteJob(jobId); // child task will be deleted by db-trigger
+        dao.DeleteJob(jobId); // child task will be deleted by db-trigger
       });
     }
@@ -346 +350 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Job job = dtoDao.GetJob(jobId);
+        Job job = dao.GetJob(jobId);
         if (job == null) throw new FaultException<FaultReason>(new FaultReason("Could not find task with id " + jobId));
-        Permission perm = DT.Convert.ToDto(dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+        Permission perm = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
         if (perm != Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permissions for this experiment"));
-        dtoDao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DT.Convert.ToEntity(permission));
+        dao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DT.Convert.ToEntity(permission));
       });
     }
@@ -357 +361 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Job job = dtoDao.GetJob(jobId);
+        Job job = dao.GetJob(jobId);
         if (job == null) throw new FaultException<FaultReason>(new FaultReason("Could not find task with id " + jobId));
-        DA.Permission perm = dtoDao.GetPermissionForJob(job.Id, userManager.CurrentUserId);
+        DA.Permission perm = dao.GetPermissionForJob(job.Id, userManager.CurrentUserId);
         if (perm != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permissions for this experiment"));
-        dtoDao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DA.Permission.NotAllowed);
+        dao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DA.Permission.NotAllowed);
       });
     }
@@ -368 +372 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        DA.Permission currentUserPermission = dtoDao.GetPermissionForJob(jobId, userManager.CurrentUserId);
+        DA.Permission currentUserPermission = dao.GetPermissionForJob(jobId, userManager.CurrentUserId);
         if (currentUserPermission != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to list permissions for this experiment"));
-        return dtoDao.GetJobPermissions(x => x.JobId == jobId);
+        return dao.GetJobPermissions(x => x.JobId == jobId);
       });
     }
@@ -387 +391 @@
 
       trans.UseTransaction(() => {
-        var slave = dtoDao.GetSlave(slaveInfo.Id);
+        var slave = dao.GetSlave(slaveInfo.Id);
 
         if (slave == null) {
-          var healGroup = dtoDao.GetResources(x => x.Name == "HEAL").First();
+          var healGroup = dao.GetResources(x => x.Name == "HEAL").First();
           if (healGroup != null) {
             slaveInfo.ParentResourceId = healGroup.Id;
           }
-          dtoDao.AddSlave(slaveInfo);
+          dao.AddSlave(slaveInfo);
         } else {
           slave.Name = slaveInfo.Name;
@@ -413 +417 @@
           // don't update those properties: dbSlave.IsAllowedToCalculate, dbSlave.ParentResourceId 
 
-          dtoDao.UpdateSlave(slave);
+          dao.UpdateSlave(slave);
         }
       });
@@ -421 +425 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
       trans.UseTransaction(() => {
-        var slave = dtoDao.GetSlave(slaveId);
+        var slave = dao.GetSlave(slaveId);
         if (slave != null) {
           slave.SlaveState = SlaveState.Offline;
-          dtoDao.UpdateSlave(slave);
+          dao.UpdateSlave(slave);
         }
       });
@@ -457 +461 @@
         plugin.DateCreated = DateTime.Now;
 
-        var existing = dtoDao.GetPlugins(x => x.Hash != null).Where(x => x.Hash.SequenceEqual(plugin.Hash));
+        var existing = dao.GetPlugins(x => x.Hash != null).Where(x => x.Hash.SequenceEqual(plugin.Hash));
         if (existing.Count() > 0) {
           // a plugin already exists.
@@ -463 +467 @@
         }
 
-        Guid pluginId = dtoDao.AddPlugin(plugin);
+        Guid pluginId = dao.AddPlugin(plugin);
         foreach (PluginData pluginData in pluginDatas) {
           pluginData.PluginId = pluginId;
-          dtoDao.AddPluginData(pluginData);
+          dao.AddPluginData(pluginData);
         }
         return pluginId;
@@ -475 +479 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       return trans.UseTransaction(() => {
-        return DT.Convert.ToDto(dao.GetPluginById(pluginId));
+        return DT.Convert.ToDto(optimizedDao.GetPluginById(pluginId));
       });
     }
@@ -482 +486 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       return trans.UseTransaction(() => {
-        return dtoDao.GetPlugins(x => x.Hash == hash).FirstOrDefault();
+        return dao.GetPlugins(x => x.Hash == hash).FirstOrDefault();
       });
     }
@@ -491 +495 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       return trans.UseTransaction(() => {
-        return dtoDao.GetPlugins(x => x.Hash != null);
+        return dao.GetPlugins(x => x.Hash != null);
       });
     }
@@ -500 +504 @@
       return trans.UseTransaction(() => {
         foreach (Guid guid in pluginIds) {
-          pluginDatas.AddRange(dtoDao.GetPluginDatas(x => x.PluginId == guid).ToList());
+          pluginDatas.AddRange(dao.GetPluginDatas(x => x.PluginId == guid).ToList());
         }
         return pluginDatas;
@@ -509 +513 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       trans.UseTransaction(() => {
-        dtoDao.DeletePlugin(pluginId);
+        dao.DeletePlugin(pluginId);
       });
     }
@@ -518 +522 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Resource resource = dtoDao.GetResource(resourceId);
+        Resource resource = dao.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)
-          dtoDao.AddResourcePermission(new ResourcePermission { ResourceId = resourceId, GrantedByUserId = userManager.CurrentUserId, GrantedUserId = id });
+          dao.AddResourcePermission(new ResourcePermission { ResourceId = resourceId, GrantedByUserId = userManager.CurrentUserId, GrantedUserId = id });
       });
     }
@@ -529 +533 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        Resource resource = dtoDao.GetResource(resourceId);
+        Resource resource = dao.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)
-          dtoDao.DeleteResourcePermission(resourceId, id);
+          dao.DeleteResourcePermission(resourceId, id);
       });
     }
@@ -540 +544 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        Resource resource = dtoDao.GetResource(resourceId);
+        Resource resource = dao.GetResource(resourceId);
         if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
-        return dtoDao.GetResourcePermissions(x => x.ResourceId == resourceId);
+        return dao.GetResourcePermissions(x => x.ResourceId == resourceId);
       });
     }
@@ -549 +553 @@
     #region Resource Methods
     public IEnumerable<Resource> GetChildResources(Guid resourceId) {
-      return trans.UseTransaction(() => { return dtoDao.GetChildResources(resourceId); });
+      return trans.UseTransaction(() => { return dao.GetChildResources(resourceId); });
     }
     #endregion
@@ -557 +561 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
 
-      Slave s = trans.UseTransaction(() => { return dtoDao.GetSlave(slaveId); });
+      Slave s = trans.UseTransaction(() => { return dao.GetSlave(slaveId); });
       if (s != null) {
         return s.HbInterval;
@@ -567 +571 @@
     public Guid AddSlave(Slave slave) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => dtoDao.AddSlave(slave));
+      return trans.UseTransaction(() => dao.AddSlave(slave));
     }
 
     public Guid AddSlaveGroup(SlaveGroup slaveGroup) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => dtoDao.AddSlaveGroup(slaveGroup));
+      return trans.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
     }
 
     public Slave GetSlave(Guid slaveId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => { return dtoDao.GetSlave(slaveId); });
+      return trans.UseTransaction(() => { return dao.GetSlave(slaveId); });
     }
 
     public SlaveGroup GetSlaveGroup(Guid slaveGroupId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => { return dtoDao.GetSlaveGroup(slaveGroupId); });
+      return trans.UseTransaction(() => { return dao.GetSlaveGroup(slaveGroupId); });
     }
 
@@ -588 +592 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        return dtoDao.GetSlaves(x => true).Where(x => x.OwnerUserId == null
+        return dao.GetSlaves(x => true).Where(x => x.OwnerUserId == null
                                            || x.OwnerUserId == userManager.CurrentUserId
                                            || userManager.VerifyUser(userManager.CurrentUserId, GetResourcePermissions(x.Id).Select(y => y.GrantedUserId).ToList())
@@ -598 +602 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        return dtoDao.GetSlaveGroups(x => true).Where(x => x.OwnerUserId == null
+        return dao.GetSlaveGroups(x => true).Where(x => x.OwnerUserId == null
                                                 || x.OwnerUserId == userManager.CurrentUserId
                                                 || userManager.VerifyUser(userManager.CurrentUserId, GetResourcePermissions(x.Id).Select(y => y.GrantedUserId).ToList())
@@ -608 +612 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        dtoDao.UpdateSlave(slave);
+        dao.UpdateSlave(slave);
       });
     }
@@ -615 +619 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       trans.UseTransaction(() => {
-        dtoDao.UpdateSlaveGroup(slaveGroup);
+        dao.UpdateSlaveGroup(slaveGroup);
       });
     }
@@ -623 +627 @@
       author.AuthorizeForResourceAdministration(slaveId);
       trans.UseTransaction(() => {
-        dtoDao.DeleteSlave(slaveId);
+        dao.DeleteSlave(slaveId);
       });
     }
@@ -631 +635 @@
       author.AuthorizeForResourceAdministration(slaveGroupId);
       trans.UseTransaction(() => {
-        dtoDao.DeleteSlaveGroup(slaveGroupId);
+        dao.DeleteSlaveGroup(slaveGroupId);
       });
     }
@@ -638 +642 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       trans.UseTransaction(() => {
-        var resource = dtoDao.GetResource(resourceId);
+        var resource = dao.GetResource(resourceId);
         resource.ParentResourceId = slaveGroupId;
-        dtoDao.UpdateResource(resource);
+        dao.UpdateResource(resource);
       });
     }
@@ -647 +651 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       trans.UseTransaction(() => {
-        var resource = dtoDao.GetResource(resourceId);
+        var resource = dao.GetResource(resourceId);
         resource.ParentResourceId = null;
-        dtoDao.UpdateResource(resource);
+        dao.UpdateResource(resource);
       });
     }
@@ -656 +660 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        var resource = dtoDao.GetResources(x => x.Name == resourceName).FirstOrDefault();
+        var resource = dao.GetResources(x => x.Name == resourceName).FirstOrDefault();
         if (resource != null) {
           return resource.Id;
@@ -670 +674 @@
       bool cleanup = false;
       trans.UseTransaction(() => {
-        DateTime lastCleanup = dtoDao.GetLastCleanup();
+        DateTime lastCleanup = dao.GetLastCleanup();
         if (force || DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
-          dtoDao.SetLastCleanup(DateTime.Now);
+          dao.SetLastCleanup(DateTime.Now);
           cleanup = true;
         }
@@ -687 +691 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       author.AuthorizeForResourceAdministration(downtime.ResourceId);
-      return trans.UseTransaction(() => dtoDao.AddDowntime(downtime));
+      return trans.UseTransaction(() => dao.AddDowntime(downtime));
     }
 
@@ -695 +699 @@
       // author.AuthorizeForResource(resourceId);
       trans.UseTransaction(() => {
-        dtoDao.DeleteDowntime(downtimeId);
+        dao.DeleteDowntime(downtimeId);
       });
     }
@@ -703 +707 @@
       author.AuthorizeForResourceAdministration(downtime.ResourceId);
       trans.UseTransaction(() => {
-        dtoDao.UpdateDowntime(downtime);
+        dao.UpdateDowntime(downtime);
       });
     }
@@ -709 +713 @@
     public IEnumerable<Downtime> GetDowntimesForResource(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => dtoDao.GetDowntimes(x => x.ResourceId == resourceId));
+      return trans.UseTransaction(() => dao.GetDowntimes(x => x.ResourceId == resourceId));
     }
     #endregion
@@ -732 +736 @@
     #region UserPriority Methods
     public IEnumerable<UserPriority> GetUserPriorities() {
-      return trans.UseTransaction(() => dtoDao.GetUserPriorities(x => true));
+      return trans.UseTransaction(() => dao.GetUserPriorities(x => true));
     }
     #endregion
@@ -738 +742 @@
     #region Helper Methods
     private IEnumerable<Task> GetChildTasks(Guid? parentTaskId, bool recursive, bool includeParent) {
-      var tasks = new List<Task>(dtoDao.GetTasks(x => parentTaskId == null ? !x.ParentTaskId.HasValue : x.ParentTaskId.Value == parentTaskId));
+      var tasks = new List<Task>(dao.GetTasks(x => parentTaskId == null ? !x.ParentTaskId.HasValue : x.ParentTaskId.Value == parentTaskId));
 
       if (recursive) {
@@ -755 +759 @@
     #region Statistics Methods
     public IEnumerable<Statistics> GetStatistics() {
-      return trans.UseTransaction(() => { return dtoDao.GetStatistics(x => true); });
+      return trans.UseTransaction(() => { return dao.GetStatistics(x => true); });
     }
     public IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to) {
-      return trans.UseTransaction(() => { return dtoDao.GetStatistics(x => x.Timestamp >= from && x.Timestamp <= to); });
+      return trans.UseTransaction(() => { return dao.GetStatistics(x => x.Timestamp >= from && x.Timestamp <= to); });
     }
     #endregion

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive {
-  public interface IHiveDtoDao {
+  public interface IHiveDao {
     #region Task Methods
     DT.Task GetTask(Guid id);

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

@@ -27 +27 @@
 using DT = HeuristicLab.Services.Hive.DataTransfer;
 namespace HeuristicLab.Services.Hive {
-  public interface IHiveDao {
+  public interface IOptimizedHiveDao {
     #region Task Methods
     Task GetTaskById(Guid task);
@@ -38 +38 @@
     void UpdateTask(Task task);
     Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception);
+
+    Guid AddTask(Task task);
+    void AssignJobToResource(Guid taskId, IEnumerable<Guid> resourceIds);
 
     bool TaskIsAllowedToBeCalculatedBySlave(Guid taskId, Guid slaveId);
@@ -81 +84 @@
 
     #region Resource Methods
-
+    IEnumerable<Guid> GetAssignedResourceIds(Guid jobId);
     #endregion
 

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; }
+    IOptimizedHiveDao OptimizedHiveDao { get; }
     IEventManager EventManager { get; }
     ITransactionManager TransactionManager { 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.HiveDtoDao.GetPermissionForTask(taskId, ServiceLocator.Instance.UserManager.CurrentUserId);
+      Permission permission = ServiceLocator.Instance.HiveDao.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.HiveDtoDao.GetPermissionForJob(jobId, ServiceLocator.Instance.UserManager.CurrentUserId);
+      Permission permission = ServiceLocator.Instance.HiveDao.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.HiveDtoDao.GetResource(resourceId));
+      Resource resource = DT.Convert.ToEntity(ServiceLocator.Instance.HiveDao.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 IHiveDtoDao dao {
-      get { return ServiceLocator.Instance.HiveDtoDao; }
+    private IHiveDao dao {
+      get { return ServiceLocator.Instance.HiveDao; }
     }
     private IAuthorizationManager auth {

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

@@ -31 +31 @@
     private const string MutexName = "HiveTaskSchedulingMutex";
 
-    private IHiveDao dao {
-      get { return ServiceLocator.Instance.HiveDao; }
+    private IOptimizedHiveDao dao {
+      get { return ServiceLocator.Instance.OptimizedHiveDao; }
     }
     private ITaskScheduler taskScheduler {

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive.DataAccess {
-  public class HiveDao : IHiveDao {
-    private HiveDataContext Db { get { return HiveOperationContext.Current.DataContext; } }
+  public class OptimizedHiveDao : IOptimizedHiveDao {
+    private static HiveDataContext Db { get { return HiveOperationContext.Current.DataContext; } }
 
     #region Task Methods
@@ -35 +35 @@
     }
 
-    private static Func<HiveDataContext, Guid, IQueryable<Task>> GetTaskByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid taskId) =>
+    private static readonly Func<HiveDataContext, Guid, IQueryable<Task>> GetTaskByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid taskId) =>
       from t in db.Tasks
       where t.TaskId == taskId
@@ -51 +51 @@
     }
 
-    private static Func<HiveDataContext, Guid, IQueryable<Tuple<Task, Guid?>>> GetTaskByIdAndLastStateLogSlaveIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid taskId) =>
+    private static readonly Func<HiveDataContext, Guid, IQueryable<Tuple<Task, Guid?>>> GetTaskByIdAndLastStateLogSlaveIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid taskId) =>
        from t in db.Tasks
        join sl in db.StateLogs on t.TaskId equals sl.TaskId
@@ -89 +89 @@
     }
 
-    private static Func<HiveDataContext, Guid, IQueryable<DT.LightweightTask>> GetLightweightTasksQuery = CompiledQuery.Compile((HiveDataContext db, Guid jobId) =>
+    private static readonly Func<HiveDataContext, Guid, IQueryable<DT.LightweightTask>> GetLightweightTasksQuery = CompiledQuery.Compile((HiveDataContext db, Guid jobId) =>
         from task in db.Tasks
         where task.JobId == jobId
@@ -103 +103 @@
     );
 
-    static Func<StateLog, DT.StateLog> ConvertStateLog = sl => DT.Convert.ToDto(sl);
-    static Func<TaskState, DT.TaskState> ConvertTaskState = ts => DT.Convert.ToDto(ts);
-    static Func<Command?, DT.Command?> ConvertCommand = c => DT.Convert.ToDto(c);
+    private static readonly Func<StateLog, DT.StateLog> ConvertStateLog = sl => DT.Convert.ToDto(sl);
+    private static readonly Func<TaskState, DT.TaskState> ConvertTaskState = ts => DT.Convert.ToDto(ts);
+    private static readonly Func<Command?, DT.Command?> ConvertCommand = c => DT.Convert.ToDto(c);
 
     public void UpdateTask(Task task) {
@@ -127 +127 @@
 
       return task;
+    }
+
+    public Guid AddTask(Task task) {
+      Db.Tasks.InsertOnSubmit(task);
+      Db.SubmitChanges();
+      return task.TaskId;
+    }
+
+    public void AssignJobToResource(Guid taskId, IEnumerable<Guid> resourceIds) {
+      Db.AssignedResources.InsertAllOnSubmit(resourceIds.Select(resourceId => new AssignedResource { TaskId = taskId, ResourceId = resourceId }));
+      Db.SubmitChanges();
     }
 
@@ -153 +164 @@
     }
 
-    private static Func<HiveDataContext, Guid, IQueryable<TaskData>> GetTaskDataByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid id) =>
+    private static readonly Func<HiveDataContext, Guid, IQueryable<TaskData>> GetTaskDataByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid id) =>
       from t in db.TaskDatas
       where t.TaskId == id
@@ -187 +198 @@
     }
 
-    private static Func<HiveDataContext, Guid, IQueryable<Plugin>> GetPluginByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid pluginId) =>
+    private static readonly Func<HiveDataContext, Guid, IQueryable<Plugin>> GetPluginByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid pluginId) =>
       from p in db.Plugins
       where p.PluginId == pluginId
@@ -204 +215 @@
     }
 
-    private static Func<HiveDataContext, Guid, IQueryable<Slave>> GetSlaveByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid slaveId) =>
+    private static readonly Func<HiveDataContext, Guid, IQueryable<Slave>> GetSlaveByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid slaveId) =>
       from s in db.Resources.OfType<Slave>()
       where s.ResourceId == slaveId
@@ -243 +254 @@
 
     #region Resource Methods
+    public IEnumerable<Guid> GetAssignedResourceIds(Guid taskId) {
+      return GetAssignedResourceIdsQuery(Db, taskId);
+    }
+
+    private static readonly Func<HiveDataContext, Guid, IQueryable<Guid>> GetAssignedResourceIdsQuery = CompiledQuery.Compile((HiveDataContext db, Guid taskId) =>
+      from ar in db.AssignedResources
+      where ar.TaskId == taskId
+      select ar.ResourceId
+    );
     #endregion
 

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

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

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

@@ -34 +34 @@
     }
 
-    private IHiveDtoDao hiveDtoDao;
-    public IHiveDtoDao HiveDtoDao {
-      get {
-        if (hiveDtoDao == null) hiveDtoDao = new HiveDtoDao();
-        return hiveDtoDao;
-      }
-    }
-
     private IHiveDao hiveDao;
     public IHiveDao HiveDao {
@@ -47 +39 @@
         if (hiveDao == null) hiveDao = new HiveDao();
         return hiveDao;
+      }
+    }
+
+    private IOptimizedHiveDao optimizedHiveDao;
+    public IOptimizedHiveDao OptimizedHiveDao {
+      get {
+        if (optimizedHiveDao == null) optimizedHiveDao = new OptimizedHiveDao();
+        return optimizedHiveDao;
       }
     }