Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/18/15 11:58:58 (9 years ago)
Author:
dglaser
Message:

#2388:
HeuristicLab.Services.Hive.DataAccess-3.3:

  • Added PersistenceManager with corresponding daos
  • Updated SQL Scripts
  • Fixed folder structure (interfaces, manager)
  • Removed duplicated IHiveDao and HiveDao (the HiveDao/OptimizedHiveDao that is actually used is located in HeuristicLab.Services.Hive)

HeuristicLab.Service.Hive-3.3:

  • Added PersistenceManager to the ServiceLocater
  • Updated and improved the HiveStatisticsGenerator
  • Updated HiveJanitor
Location:
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3
Files:
31 added
6 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

    r11623 r12468  
    104104  <ItemGroup>
    105105    <None Include="Plugin.cs.frame" />
     106    <Compile Include="Daos\AssignedResourceDao.cs" />
     107    <Compile Include="Daos\DowntimeDao.cs" />
     108    <Compile Include="Daos\GenericDao.cs" />
     109    <Compile Include="Daos\HiveStatistics\DimClientDao.cs" />
     110    <Compile Include="Daos\HiveStatistics\DimJobDao.cs" />
     111    <Compile Include="Daos\HiveStatistics\DimTimeDao.cs" />
     112    <Compile Include="Daos\HiveStatistics\DimUserDao.cs" />
     113    <Compile Include="Daos\HiveStatistics\FactClientInfoDao.cs" />
     114    <Compile Include="Daos\HiveStatistics\FactTaskDao.cs" />
     115    <Compile Include="Daos\JobDao.cs" />
     116    <Compile Include="Daos\JobPermissionDao.cs" />
     117    <Compile Include="Daos\LifecycleDao.cs" />
     118    <Compile Include="Daos\PluginDao.cs" />
     119    <Compile Include="Daos\PluginDataDao.cs" />
     120    <Compile Include="Daos\RequiredPluginDao.cs" />
     121    <Compile Include="Daos\ResourceDao.cs" />
     122    <Compile Include="Daos\ResourcePermissionDao.cs" />
     123    <Compile Include="Daos\SlaveDao.cs" />
     124    <Compile Include="Daos\SlaveGroupDao.cs" />
     125    <Compile Include="Daos\StateLogDao.cs" />
     126    <Compile Include="Daos\TaskDao.cs" />
     127    <Compile Include="Daos\TaskDataDao.cs" />
     128    <Compile Include="Daos\UserPriorityDao.cs" />
     129    <Compile Include="Interfaces\IGenericDao.cs" />
    106130    <Compile Include="Enums\Command.cs" />
    107131    <Compile Include="Enums\DowntimeType.cs" />
    108132    <Compile Include="Enums\CpuArchitecture.cs" />
     133    <Compile Include="Interfaces\IPersistenceManager.cs" />
     134    <Compile Include="Manager\PersistenceManager.cs" />
    109135    <Compile Include="Plugin.cs" />
    110136    <Compile Include="HiveDataContext.cs">
    … …  
    116142      <DependentUpon>HiveDataContext.dbml</DependentUpon>
    117143    </Compile>
    118     <Compile Include="ITransactionManager.cs" />
     144    <Compile Include="Interfaces\ITransactionManager.cs" />
    119145    <Compile Include="Enums\TaskState.cs" />
    120146    <Compile Include="Logger.cs" />
    … …  
    128154    </Compile>
    129155    <Compile Include="Enums\SlaveState.cs" />
    130     <Compile Include="TransactionManager.cs" />
     156    <Compile Include="Manager\TransactionManager.cs" />
    131157  </ItemGroup>
    132158  <ItemGroup>
    … …  
    158184    <Content Include="SQL Scripts\Prepare Hive Database.sql" />
    159185  </ItemGroup>
     186  <ItemGroup />
    160187  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    161188  <PropertyGroup>

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

    r12441 r12468  
    11<?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.Hive-3.3" Class="HiveDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
    2   <Connection Mode="AppSettings" ConnectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Hive.DataAccess.Settings" SettingsPropertyName="HeuristicLab_Hive_LinqConnectionString" Provider="System.Data.SqlClient" />
     2  <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Hive.DataAccess.Settings" SettingsPropertyName="HeuristicLab_Hive_LinqConnectionString" Provider="System.Data.SqlClient" />
    33  <Table Name="dbo.AssignedResources" Member="AssignedResources">
    44    <Type Name="AssignedResource">
    … …  
    233233      <Column Name="MemoryRequired" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
    234234      <Column Name="Priority" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
    235       <Column Name="LastClientId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
     235      <Column Name="LastClientId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="true" />
    236236      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
    237237      <Column Name="StartTime" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout

    r12441 r12468  
    297297      </nodes>
    298298    </associationConnector>
    299     <associationConnector edgePoints="[(5.02343625 : 10.2708968098958); (5.02343625 : 14.7227579166667); (6.875 : 14.7227579166667)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     299    <associationConnector edgePoints="[(5.02343625 : 10.2708968098958); (5.02343625 : 14.7227579166667); (5.90885291666667 : 14.7227579166667 : JumpStart); (6.07551958333333 : 14.7227579166667 : JumpEnd); (6.875 : 14.7227579166667)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    300300      <AssociationMoniker Name="/HiveDataContext/DimTime/DimTime_FactTask" />
    301301      <nodes>

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

    r12441 r12468  
    33// <auto-generated>
    44//     This code was generated by a tool.
    5 //     Runtime Version:4.0.30319.34014
     5//     Runtime Version:4.0.30319.34209
    66//
    77//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    48634863    private int _Priority;
    48644864   
    4865     private System.Guid _LastClientId;
     4865    private System.Nullable<System.Guid> _LastClientId;
    48664866   
    48674867    private System.Guid _JobId;
    … …  
    49054905    partial void OnPriorityChanging(int value);
    49064906    partial void OnPriorityChanged();
    4907     partial void OnLastClientIdChanging(System.Guid value);
     4907    partial void OnLastClientIdChanging(System.Nullable<System.Guid> value);
    49084908    partial void OnLastClientIdChanged();
    49094909    partial void OnJobIdChanging(System.Guid value);
    … …  
    51095109   
    51105110    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastClientId", DbType="UniqueIdentifier NOT NULL")]
    5111     public System.Guid LastClientId
     5111    public System.Nullable<System.Guid> LastClientId
    51125112    {
    51135113      get
    … …  
    52715271          else
    52725272          {
    5273             this._LastClientId = default(System.Guid);
     5273            this._LastClientId = default(Nullable<System.Guid>);
    52745274          }
    52755275          this.SendPropertyChanged("DimClient");

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql

    r12441 r12468  
    239239    [TotalMemory]           INT              NOT NULL,
    240240    [CpuUtilization]        FLOAT (53)       NOT NULL,
    241   [SlaveState]      VarChar(15)    NOT NULL,
     241    [SlaveState]      VarChar(15)    NOT NULL,
    242242    [TotalTimeIdle]         FLOAT (53)       NOT NULL,
    243243    [TotalTimeCalculating]  FLOAT (53)       NOT NULL,
    … …  
    260260    [MemoryRequired]     INT              NOT NULL,
    261261    [Priority]           INT              NOT NULL,
    262     [LastClientId]       UNIQUEIDENTIFIER NOT NULL,
     262    [LastClientId]       UNIQUEIDENTIFIER NULL,
    263263    [JobId]              UNIQUEIDENTIFIER NOT NULL,
    264264    [StartTime]          DATETIME         NOT NULL,
    265265    [EndTime]            DATETIME         NULL,
    266   [TaskState]          VARCHAR (30)     NOT NULL,
    267   [Exception]      VARCHAR (MAX)    NULL,
     266    [TaskState]          VARCHAR (30)     NOT NULL,
     267    [Exception]      VARCHAR (MAX)    NULL,
    268268    CONSTRAINT [PK_FactTask] PRIMARY KEY CLUSTERED ([TaskId] ASC),
    269269    CONSTRAINT [FK_FactTask_DimClient] FOREIGN KEY ([LastClientId]) REFERENCES [statistics].[DimClient] ([Id]),
    … …  
    273273);
    274274
    275 INSERT INTO [HeuristicLab.Hive-3.3].[statistics].[DimClient] ([Id] ,[Name] ,[ResourceId])
    276 VALUES ('00000000-0000-0000-0000-000000000000' ,'NULL' ,'00000000-0000-0000-0000-000000000000')
     275/* dummy for nullable userIds in FactClientInfo */
     276INSERT INTO [statistics].[DimUser] ([UserId], [Name])
     277VALUES ('00000000-0000-0000-0000-000000000000', 'NULL');
Note: See TracChangeset for help on using the changeset viewer.