Changeset 6369 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess

Timestamp:

06/06/11 17:49:27 (14 years ago)

Author:

cneumuel

Message:

#1233

• added consideration of appointments in heartbeats
• code cleanup

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4

Files:

• HeuristicLab.Services.Hive.DataAccess-3.4.csproj (modified) (3 diffs)
• HeuristicLabServicesHiveDataAccessPlugin.cs.frame (modified) (1 diff)
• HiveDao.cs (modified) (8 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HeuristicLab.Services.Hive.DataAccess-3.4.csproj

@@ -71 +71 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.Clients.Common-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
@@ -118 +115 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="Tools\CreateHiveDatabaseApplication.cs" />
     <Compile Include="TransactionManager.cs" />
   </ItemGroup>
@@ -151 +147 @@
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Tools\cleanHiveDatabase.sql" />
     <Content Include="Tools\prepareHiveDatabase.sql" />
   </ItemGroup>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HeuristicLabServicesHiveDataAccessPlugin.cs.frame

@@ -8 +8 @@
   [Plugin("HeuristicLab.Services.Hive.DataAccess", "3.4.0.$WCREV$")]
   [PluginFile("HeuristicLab.Services.Hive.DataAccess-3.4.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs

@@ -152 +152 @@
 
     #region JobData Methods
-
     public DT.JobData GetJobData(Guid id) {
       using (var db = CreateContext()) {
@@ -193 +192 @@
 
     #region StateLog Methods
-
     public DT.StateLog GetStateLog(Guid id) {
       using (var db = CreateContext()) {
@@ -285 +283 @@
 
     #region HiveExperimentPermission Methods
-
     public DT.HiveExperimentPermission GetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId) {
       using (var db = CreateContext()) {
@@ -322 +319 @@
       }
     }
-
     #endregion
 
@@ -366 +362 @@
 
     #region PluginData Methods
-
     public DT.PluginData GetPluginData(Guid id) {
       using (var db = CreateContext()) {
@@ -399 +394 @@
     public void DeletePluginData(Guid id) {
       using (var db = CreateContext()) {
-        var entity = db.PluginDatas.FirstOrDefault(x => x.PluginDataId == id); // todo: check if all the byte[] is loaded into memory here. otherwise work around to delete without loading it
+        var entity = db.PluginDatas.FirstOrDefault(x => x.PluginDataId == id);
         if (entity != null) db.PluginDatas.DeleteOnSubmit(entity);
         db.SubmitChanges();
@@ -611 +606 @@
       }
     }
-
     #endregion
 
@@ -682 +676 @@
       using (var db = CreateContext()) {
         return Convert.ToDto(db.Statistics.SingleOrDefault(x => x.StatisticsId == id));
-
       }
     }