Changeset 12516 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess

Timestamp:

06/25/15 18:34:40 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated daos
• changed statistics database schema
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp.Statistics-3.3:

• added jobs, client and user page

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimClientDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimJobDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/FactClientInfoDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/FactTaskDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout (modified) (7 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs (modified) (10 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimClientDao.cs

@@ -37 +37 @@
       return Table.SingleOrDefault(x => x.Id == id);
     }
-    public IQueryable<DimClient> GetRecentlyAddedClients() {
+    public IQueryable<DimClient> GetActiveClients() {
       return Table.Where(x => x.ExpirationTime == null);
+    }
+
+    public IQueryable<DimClient> GetExpiredClients() {
+      return Table.Where(x => x.ExpirationTime != null);
     }
 

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimJobDao.cs

@@ -35 +35 @@
       return Table.Where(x => x.UserId == id);
     }
+
+    public IQueryable<DimJob> GetNotCompletedJobs() {
+      return Table.Where(x => x.DateCompleted == null);
+    }
+
+    public IQueryable<DimJob> GetCompletedJobs() {
+      return Table.Where(x => x.DateCompleted != null);
+    }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/FactClientInfoDao.cs

@@ -59 +59 @@
              };
     }
+
+    public IQueryable<FactClientInfo> GetByClientId(Guid id) {
+      return Table.Where(x => x.ClientId == id);
+    }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/FactTaskDao.cs

@@ -44 +44 @@
     }
 
+    public DateTime? GetLastCompletedTaskFromJob(Guid id) {
+      return Table.Where(x => x.JobId == id && x.EndTime != null).Max(x => x.EndTime);
+    }
+
+    public IQueryable<FactTask> GetByClientId(Guid id) {
+      return Table.Where(x => x.LastClientId == id);
+    }
+
     public override void Delete(IEnumerable<Guid> ids) {
       string paramIds = string.Join(",", ids.Select(x => string.Format("'{0}'", x)));

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs

@@ -35 +35 @@
       return Table.Where(x => !x.IsParentTask);
     }
+
+    public IQueryable<Task> GetAllByJobId(Guid id) {
+      return Table.Where(x => x.JobId == id);
+    }
   }
 }

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

@@ -218 +218 @@
       <Column Name="ResourceGroupId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
       <Column Name="ResourceGroup2Id" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
+      <Column Name="GroupName" Type="System.String" CanBeNull="true" />
+      <Column Name="GroupName2" Type="System.String" CanBeNull="true" />
       <Association Name="DimClient_FactTask" Member="FactTasks" ThisKey="Id" OtherKey="LastClientId" Type="FactTask" />
       <Association Name="DimClient_FactClientInfo" Member="FactClientInfos" ThisKey="Id" OtherKey="ClientId" Type="FactClientInfo" />
@@ -250 +252 @@
       <Column Name="JobName" Type="System.String" DbType="VarChar(MAX) NOT NULL" CanBeNull="false" />
       <Column Name="UserName" Type="System.String" DbType="VarChar(MAX) NOT NULL" CanBeNull="false" />
-      <Column Name="DateCreated" Type="System.DateTime" CanBeNull="false" />
+      <Column Name="DateCreated" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
+      <Column Name="TotalTasks" Type="System.Int32" DbType="INT NOT NULL" CanBeNull="false" />
+      <Column Name="CompletedTasks" Type="System.Int32" DbType="INT NOT NULL" CanBeNull="false" />
+      <Column Name="DateCompleted" Type="System.DateTime" DbType="DateTime NULL" CanBeNull="true" />
       <Association Name="DimJob_FactTask" Member="FactTasks" ThisKey="JobId" OtherKey="JobId" Type="FactTask" />
     </Type>
@@ -283 +288 @@
       <Column Name="CpuUtilization" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />
       <Column Name="TotalTimeIdle" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />
-      <Column Name="TotalTimeCalculating" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />
-      <Column Name="TotalTimeTransferring" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />
       <Column Name="TotalTimeOffline" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />
       <Column Name="TotalTimeUnavailable" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ordesignerObjectsDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 24.25, 17.5" name="HiveDataContext">
+<ordesignerObjectsDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 24.25, 17.875" name="HiveDataContext">
   <DataContextMoniker Name="/HiveDataContext" />
   <nestedChildShapes>
@@ -247 +247 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="b5b919c2-4efc-4f09-8f52-9d541a11e961" absoluteBounds="4.625, 15.25, 2, 1.9631982421875023">
+    <classShape Id="b5b919c2-4efc-4f09-8f52-9d541a11e961" absoluteBounds="4.625, 15.25, 2, 2.3478011067708344">
       <DataClassMoniker Name="/HiveDataContext/DimClient" />
       <nestedChildShapes>
-        <elementListCompartment Id="30f62a7b-0b16-404e-b972-fb12bfe978dd" absoluteBounds="4.6400000000000006, 15.71, 1.9700000000000002, 1.4031982421875" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="30f62a7b-0b16-404e-b972-fb12bfe978dd" absoluteBounds="4.6400000000000006, 15.71, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -259 +259 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="e0cb8641-a75e-4b9f-beda-3218c56938b1" absoluteBounds="8.125, 9.125, 2, 1.7708968098958344">
+    <classShape Id="e0cb8641-a75e-4b9f-beda-3218c56938b1" absoluteBounds="8.125, 8.25, 2, 2.3478011067708344">
       <DataClassMoniker Name="/HiveDataContext/DimJob" />
       <nestedChildShapes>
-        <elementListCompartment Id="6b9e8260-7e4b-4357-9c26-eebebfd69504" absoluteBounds="8.14, 9.585, 1.9700000000000002, 1.2108968098958333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="6b9e8260-7e4b-4357-9c26-eebebfd69504" absoluteBounds="8.14, 8.71, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -277 +277 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="053a5cff-b18a-4ee5-8d43-48ed5c5dcfad" absoluteBounds="2.625, 11, 2, 3.5016097005208326">
+    <classShape Id="053a5cff-b18a-4ee5-8d43-48ed5c5dcfad" absoluteBounds="2.625, 11, 2, 3.1170068359375005">
       <DataClassMoniker Name="/HiveDataContext/FactClientInfo" />
       <nestedChildShapes>
-        <elementListCompartment Id="0a1cc913-6636-455c-95b3-302f533527db" absoluteBounds="2.6399999999999997, 11.46, 1.9700000000000002, 2.941609700520833" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="0a1cc913-6636-455c-95b3-302f533527db" absoluteBounds="2.6399999999999997, 11.46, 1.9700000000000002, 2.5570068359375" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -290 +290 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(8.5 : 10.8958968098958); (8.5 : 11.25)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(8.5 : 10.5978011067708); (8.5 : 11.25)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/DimJob/DimJob_FactTask" />
       <nodes>
@@ -297 +297 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(5.99218625 : 15.25); (5.99218625 : 12.1788329785157); (4.625 : 12.1788329785157)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(5.6249975 : 15.25); (5.6249975 : 12.5585034179688); (4.625 : 12.5585034179688)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/DimClient/DimClient_FactClientInfo" />
       <nodes>
@@ -311 +311 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(1.59375 : 10.0689925130208); (1.59375 : 12.7508048502604); (2.625 : 12.7508048502604)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(1.59375 : 10.0689925130208); (1.59375 : 12.5585034179688); (2.625 : 12.5585034179688)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/DimUser/DimUser_FactClientInfo" />
       <nodes>

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

@@ -4619 +4619 @@
     private System.Nullable<System.Guid> _ResourceGroup2Id;
     
+    private string _GroupName;
+    
+    private string _GroupName2;
+    
     private EntitySet<FactTask> _FactTasks;
     
@@ -4639 +4643 @@
     partial void OnResourceGroup2IdChanging(System.Nullable<System.Guid> value);
     partial void OnResourceGroup2IdChanged();
+    partial void OnGroupNameChanging(string value);
+    partial void OnGroupNameChanged();
+    partial void OnGroupName2Changing(string value);
+    partial void OnGroupName2Changed();
     #endregion
     
@@ -4764 +4772 @@
           this.SendPropertyChanged("ResourceGroup2Id");
           this.OnResourceGroup2IdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GroupName")]
+    public string GroupName
+    {
+      get
+      {
+        return this._GroupName;
+      }
+      set
+      {
+        if ((this._GroupName != value))
+        {
+          this.OnGroupNameChanging(value);
+          this.SendPropertyChanging();
+          this._GroupName = value;
+          this.SendPropertyChanged("GroupName");
+          this.OnGroupNameChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GroupName2")]
+    public string GroupName2
+    {
+      get
+      {
+        return this._GroupName2;
+      }
+      set
+      {
+        if ((this._GroupName2 != value))
+        {
+          this.OnGroupName2Changing(value);
+          this.SendPropertyChanging();
+          this._GroupName2 = value;
+          this.SendPropertyChanged("GroupName2");
+          this.OnGroupName2Changed();
         }
       }
@@ -5359 +5407 @@
     private System.DateTime _DateCreated;
     
+    private int _TotalTasks;
+    
+    private int _CompletedTasks;
+    
+    private System.Nullable<System.DateTime> _DateCompleted;
+    
     private EntitySet<FactTask> _FactTasks;
     
@@ -5375 +5429 @@
     partial void OnDateCreatedChanging(System.DateTime value);
     partial void OnDateCreatedChanged();
+    partial void OnTotalTasksChanging(int value);
+    partial void OnTotalTasksChanged();
+    partial void OnCompletedTasksChanging(int value);
+    partial void OnCompletedTasksChanged();
+    partial void OnDateCompletedChanging(System.Nullable<System.DateTime> value);
+    partial void OnDateCompletedChanged();
     #endregion
     
@@ -5463 +5523 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCreated")]
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCreated", DbType="DateTime NOT NULL")]
     public System.DateTime DateCreated
     {
@@ -5479 +5539 @@
           this.SendPropertyChanged("DateCreated");
           this.OnDateCreatedChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTasks", DbType="INT NOT NULL")]
+    public int TotalTasks
+    {
+      get
+      {
+        return this._TotalTasks;
+      }
+      set
+      {
+        if ((this._TotalTasks != value))
+        {
+          this.OnTotalTasksChanging(value);
+          this.SendPropertyChanging();
+          this._TotalTasks = value;
+          this.SendPropertyChanged("TotalTasks");
+          this.OnTotalTasksChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletedTasks", DbType="INT NOT NULL")]
+    public int CompletedTasks
+    {
+      get
+      {
+        return this._CompletedTasks;
+      }
+      set
+      {
+        if ((this._CompletedTasks != value))
+        {
+          this.OnCompletedTasksChanging(value);
+          this.SendPropertyChanging();
+          this._CompletedTasks = value;
+          this.SendPropertyChanged("CompletedTasks");
+          this.OnCompletedTasksChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCompleted", DbType="DateTime NULL")]
+    public System.Nullable<System.DateTime> DateCompleted
+    {
+      get
+      {
+        return this._DateCompleted;
+      }
+      set
+      {
+        if ((this._DateCompleted != value))
+        {
+          this.OnDateCompletedChanging(value);
+          this.SendPropertyChanging();
+          this._DateCompleted = value;
+          this.SendPropertyChanged("DateCompleted");
+          this.OnDateCompletedChanged();
         }
       }
@@ -5876 +5996 @@
     
     private double _TotalTimeIdle;
-    
-    private double _TotalTimeCalculating;
-    
-    private double _TotalTimeTransferring;
     
     private double _TotalTimeOffline;
@@ -5915 +6031 @@
     partial void OnTotalTimeIdleChanging(double value);
     partial void OnTotalTimeIdleChanged();
-    partial void OnTotalTimeCalculatingChanging(double value);
-    partial void OnTotalTimeCalculatingChanged();
-    partial void OnTotalTimeTransferringChanging(double value);
-    partial void OnTotalTimeTransferringChanged();
     partial void OnTotalTimeOfflineChanging(double value);
     partial void OnTotalTimeOfflineChanged();
@@ -6127 +6239 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTimeCalculating", DbType="Float NOT NULL")]
-    public double TotalTimeCalculating
-    {
-      get
-      {
-        return this._TotalTimeCalculating;
-      }
-      set
-      {
-        if ((this._TotalTimeCalculating != value))
-        {
-          this.OnTotalTimeCalculatingChanging(value);
-          this.SendPropertyChanging();
-          this._TotalTimeCalculating = value;
-          this.SendPropertyChanged("TotalTimeCalculating");
-          this.OnTotalTimeCalculatingChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTimeTransferring", DbType="Float NOT NULL")]
-    public double TotalTimeTransferring
-    {
-      get
-      {
-        return this._TotalTimeTransferring;
-      }
-      set
-      {
-        if ((this._TotalTimeTransferring != value))
-        {
-          this.OnTotalTimeTransferringChanging(value);
-          this.SendPropertyChanging();
-          this._TotalTimeTransferring = value;
-          this.SendPropertyChanged("TotalTimeTransferring");
-          this.OnTotalTimeTransferringChanged();
-        }
-      }
-    }
-    
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTimeOffline", DbType="Float NOT NULL")]
     public double TotalTimeOffline

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

@@ -217 +217 @@
     [ResourceGroupId]  UNIQUEIDENTIFIER NULL,
     [ResourceGroup2Id] UNIQUEIDENTIFIER NULL,
+  [GroupName]        VARCHAR (MAX)    NULL,
+  [GroupName2]       VARCHAR (MAX)    NULL,
     CONSTRAINT [PK_DimClient] PRIMARY KEY CLUSTERED ([Id] ASC)
 );
 CREATE TABLE [statistics].[DimJob] (
-    [JobId]       UNIQUEIDENTIFIER NOT NULL,
-    [UserId]      UNIQUEIDENTIFIER NOT NULL,
-    [JobName]     VARCHAR (MAX)    NOT NULL,
-    [UserName]    VARCHAR (MAX)    NOT NULL,
-    [DateCreated] DATETIME       NOT NULL,
+    [JobId]          UNIQUEIDENTIFIER NOT NULL,
+    [UserId]         UNIQUEIDENTIFIER NOT NULL,
+    [JobName]        VARCHAR (MAX)    NOT NULL,
+    [UserName]       VARCHAR (MAX)    NOT NULL,
+    [DateCreated]    DATETIME     NOT NULL,
+    [TotalTasks]     INT              NOT NULL,
+    [CompletedTasks] INT              NOT NULL,
+    [DateCompleted]  DATETIME     NULL,
     CONSTRAINT [PK_DimJob] PRIMARY KEY CLUSTERED ([JobId] ASC)
 );
@@ -243 +248 @@
     [SlaveState]      VarChar(15)    NOT NULL,
     [TotalTimeIdle]         FLOAT (53)       NOT NULL,
-    [TotalTimeCalculating]  FLOAT (53)       NOT NULL,
-    [TotalTimeTransferring] FLOAT (53)       NOT NULL,
     [TotalTimeOffline]      FLOAT (53)       NOT NULL,
     [TotalTimeUnavailable]  FLOAT (53)       NOT NULL,