Changeset 11204 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive

Timestamp:

07/18/14 13:34:37 (10 years ago)

Author:

ascheibe

Message:

merged only Hive changes from trunk into branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive

Files:

• . (modified) (1 prop)
• 3.3/Convert.cs (modified) (1 diff)
• 3.3/DataTransfer/Command.cs (modified) (1 diff)
• 3.3/DataTransfer/Downtime.cs (modified) (1 diff)
• 3.3/DataTransfer/Heartbeat.cs (modified) (1 diff)
• 3.3/DataTransfer/HiveItem.cs (modified) (1 diff)
• 3.3/DataTransfer/Job.cs (modified) (1 diff)
• 3.3/DataTransfer/JobPermission.cs (modified) (1 diff)
• 3.3/DataTransfer/LightweightTask.cs (modified) (1 diff)
• 3.3/DataTransfer/NamedHiveItem.cs (modified) (1 diff)
• 3.3/DataTransfer/Permission.cs (modified) (1 diff)
• 3.3/DataTransfer/Plugin.cs (modified) (1 diff)
• 3.3/DataTransfer/PluginData.cs (modified) (1 diff)
• 3.3/DataTransfer/Resource.cs (modified) (1 diff)
• 3.3/DataTransfer/ResourcePermission.cs (modified) (1 diff)
• 3.3/DataTransfer/Slave.cs (modified) (1 diff)
• 3.3/DataTransfer/SlaveGroup.cs (modified) (1 diff)
• 3.3/DataTransfer/SlaveState.cs (modified) (1 diff)
• 3.3/DataTransfer/SlaveStatistics.cs (modified) (1 diff)
• 3.3/DataTransfer/StateLog.cs (modified) (1 diff)
• 3.3/DataTransfer/Statistics.cs (modified) (1 diff)
• 3.3/DataTransfer/Task.cs (modified) (1 diff)
• 3.3/DataTransfer/TaskData.cs (modified) (1 diff)
• 3.3/DataTransfer/TaskState.cs (modified) (1 diff)
• 3.3/DataTransfer/UserPriority.cs (modified) (1 diff)
• 3.3/DataTransfer/UserStatistics.cs (modified) (1 diff)
• 3.3/HiveDao.cs (modified) (1 diff)
• 3.3/HiveJanitor.cs (modified) (1 diff)
• 3.3/HiveOperationContext.cs (modified) (2 diffs)
• 3.3/HiveRoles.cs (modified) (1 diff)
• 3.3/HiveService.cs (modified) (4 diffs)
• 3.3/Interfaces/IAuthorizationManager.cs (modified) (1 diff)
• 3.3/Interfaces/IEventManager.cs (modified) (1 diff)
• 3.3/Interfaces/IHiveDao.cs (modified) (1 diff)
• 3.3/Interfaces/IOptimizedHiveDao.cs (modified) (4 diffs)
• 3.3/Interfaces/IServiceLocator.cs (modified) (1 diff)
• 3.3/Interfaces/ITaskScheduler.cs (modified) (1 diff)
• 3.3/Manager/AuthorizationManager.cs (modified) (1 diff)
• 3.3/Manager/EventManager.cs (modified) (1 diff)
• 3.3/Manager/HeartbeatManager.cs (modified) (4 diffs)
• 3.3/MessageContainer.cs (modified) (1 diff)
• 3.3/OptimizedHiveDao.cs (modified) (8 diffs)
• 3.3/Plugin.cs.frame (modified) (2 diffs)
• 3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• 3.3/Scheduler/JobInfoForScheduler.cs (modified) (1 diff)
• 3.3/Scheduler/RoundRobinTaskScheduler.cs (modified) (1 diff)
• 3.3/Scheduler/TaskInfoForScheduler.cs (modified) (1 diff)
• 3.3/ServiceContracts/IHiveService.cs (modified) (1 diff)
• 3.3/ServiceFaults/PluginAlreadyExistsFault.cs (modified) (1 diff)
• 3.3/ServiceLocator.cs (modified) (2 diffs)
• 3.3/Settings.cs (modified) (1 diff)

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Command.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Downtime.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Heartbeat.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/HiveItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Job.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/JobPermission.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/LightweightTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/NamedHiveItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Permission.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Plugin.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/PluginData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Resource.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/ResourcePermission.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Slave.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/SlaveGroup.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/SlaveState.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/SlaveStatistics.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/StateLog.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Statistics.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Task.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/TaskData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/TaskState.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/UserPriority.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/UserStatistics.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -33 +33 @@
     public static HiveOperationContext Current {
       get {
-        return OperationContext.Current.Extensions.Find<HiveOperationContext>();
+        return OperationContext.Current != null
+          ? OperationContext.Current.Extensions.Find<HiveOperationContext>()
+          : null;
       }
     }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveRoles.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -87 +87 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       task.ParentTaskId = parentTaskId;
-      return AddTask(task, taskData, optimizedDao.GetAssignedResourceIds(parentTaskId));
+      return AddTask(task, taskData, optimizedDao.GetAssignedResourceIds(parentTaskId).ToList());
     }
 
@@ -222 +222 @@
         }
 
-        //optimizedDao.UpdateTaskAndPlugins(task); no idea why this is needed
         return DT.Convert.ToDto(task);
       });
@@ -394 +393 @@
 
         if (slave == null) {
-          var healGroup = dao.GetResources(x => x.Name == "HEAL").FirstOrDefault();
-          if (healGroup != null) {
-            slaveInfo.ParentResourceId = healGroup.Id;
-          }
           dao.AddSlave(slaveInfo);
         } else {

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IAuthorizationManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IEventManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -19 +19 @@
  */
 #endregion
-
 
 using System;
@@ -50 +49 @@
     #endregion
 
-    #region StateLog Methods
-
-    #endregion
-
-    #region Job Methods
-
-    #endregion
-
-    #region JobPermission Methods
-
-    #endregion
-
     #region Plugin Methods
     Plugin GetPluginById(Guid pluginId);
-    #endregion
-
-    #region PluginData Methods
-
     #endregion
 
@@ -79 +62 @@
     #endregion
 
-    #region SlaveGroup Methods
-
-    #endregion
-
     #region Resource Methods
     IEnumerable<Guid> GetAssignedResourceIds(Guid jobId);
     #endregion
-
-    #region ResourcePermission Methods
-
-    #endregion
-
-    #region Authorization Methods
-
-    #endregion
-
-    #region Lifecycle Methods
-
-    #endregion
-
-    #region Downtime Methods
-    #endregion
-
-    #region Statistics Methods
-
-    #endregion
-
-    #region UserPriority Methods
-
-    #endregion
   }
 }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/ITaskScheduler.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -73 +73 @@
           dao.UpdateSlave(slave);
         });
-      }
 
-      if (slave != null) {
         // update task data
         actions.AddRange(UpdateTasks(heartbeat, slave.IsAllowedToCalculate));
@@ -94 +92 @@
                 if (availableTasks.Any()) {
                   var task = availableTasks.First();
-                  AssignJob(slave, task.TaskId);
+                  AssignTask(slave, task.TaskId);
                   actions.Add(new MessageContainer(MessageContainer.MessageType.CalculateTask, task.TaskId));
                 }
@@ -114 +112 @@
     }
 
-    private void AssignJob(Slave slave, Guid taskId) {
-      var task = dao.UpdateTaskState(taskId, DataAccess.TaskState.Transferring, slave.ResourceId, null, null);
+    private void AssignTask(Slave slave, Guid taskId) {
+      var task = dao.UpdateTaskState(taskId, TaskState.Transferring, slave.ResourceId, null, null);
 
       // from now on the task has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/MessageContainer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
 namespace HeuristicLab.Services.Hive.DataAccess {
   public class OptimizedHiveDao : IOptimizedHiveDao {
-    private static HiveDataContext Db { get { return HiveOperationContext.Current.DataContext; } }
+    private HiveDataContext Db { get; set; }
+
+    public OptimizedHiveDao(HiveDataContext db) {
+      Db = db;
+    }
 
     #region Task Methods
@@ -52 +56 @@
 
     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
-       where t.TaskId == taskId
-       orderby sl.DateTime descending
-       group sl by t into logs
-       select new Tuple<Task, Guid?>(logs.Key, logs.First().SlaveId)
+      from t in db.Tasks
+      let lastStateLog = t.StateLogs.OrderByDescending(sl => sl.DateTime).FirstOrDefault()
+      where t.TaskId == taskId
+      select new Tuple<Task, Guid?>(t, lastStateLog != null ? lastStateLog.SlaveId : null)
     );
 
@@ -96 +98 @@
           ExecutionTime = TimeSpan.FromMilliseconds(task.ExecutionTimeMs),
           ParentTaskId = task.ParentTaskId,
-          StateLog = task.StateLogs.Select(sl => ConvertStateLog(sl)).ToList(),
+          StateLog = task.StateLogs.OrderBy(sl => sl.DateTime).Select(sl => ConvertStateLog(sl)).ToList(),
           State = ConvertTaskState(task.State),
           Command = ConvertCommand(task.Command),
@@ -181 +183 @@
     #endregion
 
-    #region StateLog Methods
-
-    #endregion
-
-    #region Job Methods
-
-    #endregion
-
-    #region JobPermission Methods
-
-    #endregion
-
     #region Plugin Methods
     public Plugin GetPluginById(Guid pluginId) {
@@ -203 +193 @@
       select p
     );
-
-    #endregion
-
-    #region PluginData Methods
-
     #endregion
 
@@ -249 +234 @@
     #endregion
 
-    #region SlaveGroup Methods
-
-    #endregion
-
     #region Resource Methods
     public IEnumerable<Guid> GetAssignedResourceIds(Guid taskId) {
@@ -264 +245 @@
     );
     #endregion
-
-    #region ResourcePermission Methods
-
-    #endregion
-
-    #region Authorization Methods
-
-    #endregion
-
-    #region Lifecycle Methods
-
-    #endregion
-
-    #region Downtime Methods
-    #endregion
-
-    #region Statistics Methods
-
-    #endregion
-
-    #region UserPriority Methods
-
-    #endregion
-
-    #region Helpers
-
-    #endregion
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive.Server {
-  [Plugin("HeuristicLab.Services.Hive", "3.3.7.$WCREV$")]
+  [Plugin("HeuristicLab.Services.Hive", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Services.Hive-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/JobInfoForScheduler.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/TaskInfoForScheduler.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceFaults/PluginAlreadyExistsFault.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -42 +42 @@
     }
 
-    private IOptimizedHiveDao optimizedHiveDao;
     public IOptimizedHiveDao OptimizedHiveDao {
       get {
-        if (optimizedHiveDao == null) optimizedHiveDao = new OptimizedHiveDao();
-        return optimizedHiveDao;
+        var dataContext = HiveOperationContext.Current != null
+                            ? HiveOperationContext.Current.DataContext
+                            : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
+        return new OptimizedHiveDao(dataContext);
       }
     }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Settings.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.