Changeset 12691 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Manager/PersistenceManager.cs

Timestamp:

07/08/15 15:51:32 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Access:
HeuristicLab.Services.Access.DataAccess:

• Changed connection strings and certificates for local usage

HeuristicLab.Services.Hive.DataAccess:

• Added compiled queries for frequently used queries
• Integrated string queries from OptimizedHiveDao

HeuristicLab.Services.Hive:

• Added NewHeartbeatManager.cs
• Added NewRoundRobinTaskScheduler.cs
• Added PerformanceLogger
• Updated AuthoriziationManager
• Updated NewHiveService
  • Added Regions
  • Implemented missing methods
  • Improved performance of several queries

HeuristicLab.Services.WebApp.Status:

• Fixed a bug which caused an error when calculating the average waiting time.

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Manager/PersistenceManager.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Manager/PersistenceManager.cs

@@ -35 +35 @@
 
     #region Hive daos
+
+    private AssignedResourceDao assignedResourceDao;
     public AssignedResourceDao AssignedResourceDao {
-      get { return new AssignedResourceDao(dataContext); }
-    }
-
+      get { return assignedResourceDao ?? (assignedResourceDao = new AssignedResourceDao(dataContext)); }
+    }
+
+    private DowntimeDao downtimeDao;
     public DowntimeDao DowntimeDao {
-      get { return new DowntimeDao(dataContext); }
-    }
-
+      get { return downtimeDao ?? (downtimeDao = new DowntimeDao(dataContext)); }
+    }
+
+    private JobDao jobDao;
     public JobDao JobDao {
-      get { return new JobDao(dataContext); }
-    }
-
+      get { return jobDao ?? (jobDao = new JobDao(dataContext)); }
+    }
+
+    private JobPermissionDao jobPermissionDao;
     public JobPermissionDao JobPermissionDao {
-      get { return new JobPermissionDao(dataContext); }
-    }
-
+      get { return jobPermissionDao ?? (jobPermissionDao = new JobPermissionDao(dataContext)); }
+    }
+
+    private LifecycleDao lifecycleDao;
     public LifecycleDao LifecycleDao {
-      get { return new LifecycleDao(dataContext); }
-    }
-
+      get { return lifecycleDao ?? (lifecycleDao = new LifecycleDao(dataContext)); }
+    }
+
+    private PluginDao pluginDao;
     public PluginDao PluginDao {
-      get { return new PluginDao(dataContext); }
-    }
-
+      get { return pluginDao ?? (pluginDao = new PluginDao(dataContext)); }
+    }
+
+    private PluginDataDao pluginDataDao;
     public PluginDataDao PluginDataDao {
-      get { return new PluginDataDao(dataContext); }
-    }
-
+      get { return pluginDataDao ?? (pluginDataDao = new PluginDataDao(dataContext)); }
+    }
+
+    private RequiredPluginDao requiredPluginDao;
     public RequiredPluginDao RequiredPluginDao {
-      get { return new RequiredPluginDao(dataContext); }
-    }
-
+      get { return requiredPluginDao ?? (requiredPluginDao = new RequiredPluginDao(dataContext)); }
+    }
+
+    private ResourceDao resourceDao;
     public ResourceDao ResourceDao {
-      get { return new ResourceDao(dataContext); }
-    }
-
+      get { return resourceDao ?? (resourceDao = new ResourceDao(dataContext)); }
+    }
+
+    private ResourcePermissionDao resourcePermissionDao;
     public ResourcePermissionDao ResourcePermissionDao {
-      get { return new ResourcePermissionDao(dataContext); }
-    }
-
+      get { return resourcePermissionDao ?? (resourcePermissionDao = new ResourcePermissionDao(dataContext)); }
+    }
+
+    private SlaveDao slaveDao;
     public SlaveDao SlaveDao {
-      get { return new SlaveDao(dataContext); }
-    }
-
+      get { return slaveDao ?? (slaveDao = new SlaveDao(dataContext)); }
+    }
+
+    private SlaveGroupDao slaveGroupDao;
     public SlaveGroupDao SlaveGroupDao {
-      get { return new SlaveGroupDao(dataContext); }
-    }
-
+      get { return slaveGroupDao ?? (slaveGroupDao = new SlaveGroupDao(dataContext)); }
+    }
+
+    private StateLogDao stateLogDao;
     public StateLogDao StateLogDao {
-      get { return new StateLogDao(dataContext); }
-    }
-
+      get { return stateLogDao ?? (stateLogDao = new StateLogDao(dataContext)); }
+    }
+
+    private TaskDao taskDao;
     public TaskDao TaskDao {
-      get { return new TaskDao(dataContext); }
-    }
-
+      get { return taskDao ?? (taskDao = new TaskDao(dataContext)); }
+    }
+
+    private TaskDataDao taskDataDao;
     public TaskDataDao TaskDataDao {
-      get { return new TaskDataDao(dataContext); }
-    }
-
+      get { return taskDataDao ?? (taskDataDao = new TaskDataDao(dataContext)); }
+    }
+
+    private UserPriorityDao userPriorityDao;
     public UserPriorityDao UserPriorityDao {
-      get { return new UserPriorityDao(dataContext); }
+      get { return userPriorityDao ?? (userPriorityDao = new UserPriorityDao(dataContext)); }
     }
     #endregion
 
     #region HiveStatistics daos
+
+    private DimClientDao dimClientDao;
     public DimClientDao DimClientDao {
-      get { return new DimClientDao(dataContext); }
-    }
-
+      get { return dimClientDao ?? (dimClientDao = new DimClientDao(dataContext)); }
+    }
+
+    private DimJobDao dimJobDao;
     public DimJobDao DimJobDao {
-      get { return new DimJobDao(dataContext); }
-    }
-
+      get { return dimJobDao ?? (dimJobDao = new DimJobDao(dataContext)); }
+    }
+
+    private DimTimeDao dimTimeDao;
     public DimTimeDao DimTimeDao {
-      get { return new DimTimeDao(dataContext); }
-    }
-
+      get { return dimTimeDao ?? (dimTimeDao = new DimTimeDao(dataContext)); }
+    }
+
+    private DimUserDao dimUserDao;
     public DimUserDao DimUserDao {
-      get { return new DimUserDao(dataContext); }
-    }
-
+      get { return dimUserDao ?? (dimUserDao = new DimUserDao(dataContext)); }
+    }
+
+    private FactClientInfoDao factClientInfoDao;
     public FactClientInfoDao FactClientInfoDao {
-      get { return new FactClientInfoDao(dataContext); }
-    }
-
+      get { return factClientInfoDao ?? (factClientInfoDao = new FactClientInfoDao(dataContext)); }
+    }
+
+    private FactTaskDao factTaskDao;
     public FactTaskDao FactTaskDao {
-      get { return new FactTaskDao(dataContext); }
+      get { return factTaskDao ?? (factTaskDao = new FactTaskDao(dataContext)); }
     }
     #endregion
@@ -130 +154 @@
       if (longRunning) context.CommandTimeout = (int)Settings.Default.LongRunningDatabaseCommandTimeout.TotalSeconds;
       dataContext = context;
+    }
+
+    public PersistenceManager(DataContext dataContext) {
+      this.dataContext = dataContext;
     }
 
@@ -179 +207 @@
 
     public void Dispose() {
-      if (dataContext != null) {
-        dataContext.Dispose();
-      }
+      //if (dataContext != null) {
+      //  dataContext.Dispose();
+      //}
     }
   }