Changeset 9399

Timestamp:

04/26/13 17:36:48 (11 years ago)

Author:

pfleck

Message:

#2030
Removed unnecessary UpdatePlugins in UpdateTask.
Optimized GetTask and GetPlugin with compiled queries.

Location:

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

Files:

• HiveDao.cs (modified) (2 diffs)
• HiveService.cs (modified) (4 diffs)
• Interfaces/IHiveDao.cs (modified) (4 diffs)

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

@@ -40 +40 @@
       select t
     );
+
+    public Task GetTaskByDto(DT.Task taskDto) {
+      var task = GetTaskById(taskDto.Id);
+      DT.Convert.ToEntity(taskDto, task);
+      return task;
+    }
 
     public Tuple<Task, Guid?> GetTaskByIdAndLastStateLogSlaveId(Guid taskId) {
@@ -177 +183 @@
 
     #region Plugin Methods
+    public Plugin GetPluginById(Guid pluginId) {
+      return GetPluginByIdQuery(Db, pluginId).SingleOrDefault();
+    }
+
+    private static Func<HiveDataContext, Guid, IQueryable<Plugin>> GetPluginByIdQuery = CompiledQuery.Compile((HiveDataContext db, Guid pluginId) =>
+      from p in db.Plugins
+      where p.PluginId == pluginId
+      select p
+    );
 
     #endregion

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

@@ -91 +91 @@
 
       return trans.UseTransaction(() => {
-        return dtoDao.GetTask(taskId);
+        return DT.Convert.ToDto(dao.GetTaskById(taskId));
       }, false, false);
     }
@@ -159 +159 @@
 
       trans.UseTransaction(() => {
-        dtoDao.UpdateTaskAndPlugins(taskDto);
+        var task = dao.GetTaskByDto(taskDto);
+        dao.UpdateTask(task);
       });
     }
@@ -167 +168 @@
       author.AuthorizeForTask(task.Id, Permission.Full);
 
-      // what for?
-      /*trans.UseTransaction(() => {
-        dtoDao.UpdateTaskAndPlugins(task);
-      });*/
+      trans.UseTransaction(() => {
+        var t = dao.GetTaskByDto(task);
+        dao.UpdateTask(t);
+      });
 
       trans.UseTransaction(() => {
@@ -474 +475 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       return trans.UseTransaction(() => {
-        return dtoDao.GetPlugin(pluginId);
+        return DT.Convert.ToDto(dao.GetPluginById(pluginId));
       });
     }

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

@@ -30 +30 @@
     #region Task Methods
     Task GetTaskById(Guid task);
+    Task GetTaskByDto(DT.Task taskDto);
     Tuple<Task, Guid?> GetTaskByIdAndLastStateLogSlaveId(Guid taskId);
 
@@ -36 +37 @@
 
     void UpdateTask(Task task);
-    void UpdateTaskAndPlugins(Task task);
     Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception);
 
@@ -43 +43 @@
 
     #region TaskData Methods
-    TaskData GetTaskDataByDto(DT.TaskData dto);
+    TaskData GetTaskDataByDto(DT.TaskData taskDataDto);
     void UpdateTaskData(TaskData taskData);
     #endregion
@@ -60 +60 @@
 
     #region Plugin Methods
-
+    Plugin GetPluginById(Guid pluginId);
     #endregion