Changeset 12551 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts

Timestamp:

06/30/15 13:12:07 (10 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated database schema
• updated sql scripts
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

HeuristicLab.Services.WebApp.Status-3.3:

• updated data api controller

HeuristicLab.Services.WebApp.Statistics-3.3:

• added exception page
• improved jobs, clients, users and groups page

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive.DataAccess (modified) (1 prop)
• HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql (modified) (3 diffs)

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,
+    [GroupName]        VARCHAR (MAX)    NULL,
+    [GroupName2]       VARCHAR (MAX)    NULL,
     CONSTRAINT [PK_DimClient] PRIMARY KEY CLUSTERED ([Id] ASC)
 );
@@ -238 +238 @@
 );
 CREATE TABLE [statistics].[FactClientInfo] (
-    [ClientId]              UNIQUEIDENTIFIER NOT NULL,
-    [Time]                  DATETIME         NOT NULL,
-    [UserId]                UNIQUEIDENTIFIER NOT NULL,
-    [NumUsedCores]          INT              NOT NULL,
-    [NumTotalCores]         INT              NOT NULL,
-    [UsedMemory]            INT              NOT NULL,
-    [TotalMemory]           INT              NOT NULL,
-    [CpuUtilization]        FLOAT (53)       NOT NULL,
-    [SlaveState]      VarChar(15)    NOT NULL,
-    [TotalTimeIdle]         FLOAT (53)       NOT NULL,
-    [TotalTimeOffline]      FLOAT (53)       NOT NULL,
-    [TotalTimeUnavailable]  FLOAT (53)       NOT NULL,
+    [ClientId]             UNIQUEIDENTIFIER NOT NULL,
+    [Time]                 DATETIME         NOT NULL,
+    [UserId]               UNIQUEIDENTIFIER NOT NULL,
+    [NumUsedCores]         INT              NOT NULL,
+    [NumTotalCores]        INT              NOT NULL,
+    [UsedMemory]           INT              NOT NULL,
+    [TotalMemory]          INT              NOT NULL,
+    [CpuUtilization]       FLOAT (53)       NOT NULL,
+    [SlaveState]           VarChar(15)      NOT NULL,
+    [IdleTime]             INT              NOT NULL,
+    [OfflineTime]          INT              NOT NULL,
+    [UnavailableTime]      INT              NOT NULL,
+    [IsAllowedToCalculate] BIT              NOT NULL,
     CONSTRAINT [PK_FactClientInfo] PRIMARY KEY CLUSTERED ([ClientId] ASC, [Time] ASC, [UserId] ASC),
     CONSTRAINT [FK_FactClientInfo_DimTime] FOREIGN KEY ([Time]) REFERENCES [statistics].[DimTime] ([Time]),
@@ -255 +256 @@
     CONSTRAINT [FK_FactClientInfo_DimUser] FOREIGN KEY ([UserId]) REFERENCES [statistics].[DimUser] ([UserId])
 );
+
 CREATE TABLE [statistics].[FactTask] (
-    [TaskId]         UNIQUEIDENTIFIER NOT NULL,
-    [CalculatingTime]    FLOAT (53)       NOT NULL,
-    [WaitingTime]      FLOAT (53)       NOT NULL,
-    [TransferTime]         FLOAT (53)       NOT NULL,
-    [NumCalculationRuns]   INT              NOT NULL,
-    [NumRetries]       INT              NOT NULL,
-    [CoresRequired]      INT              NOT NULL,
-    [MemoryRequired]     INT              NOT NULL,
-    [Priority]         INT              NOT NULL,
-    [LastClientId]       UNIQUEIDENTIFIER NULL,
-    [JobId]          UNIQUEIDENTIFIER NOT NULL,
-    [StartTime]            DATETIME         NULL,
-    [EndTime]        DATETIME         NULL,
-    [TaskState]        VARCHAR (30)     NOT NULL,
-    [Exception]        VARCHAR (MAX)  NULL,
-    [InitialWaitingTime]   FLOAT (53)       NULL,
-    CONSTRAINT [PK_FactTask] PRIMARY KEY CLUSTERED ([TaskId] ASC),
-    CONSTRAINT [FK_FactTask_DimClient] FOREIGN KEY ([LastClientId]) REFERENCES [statistics].[DimClient] ([Id]),
-    CONSTRAINT [FK_FactTask_DimJob] FOREIGN KEY ([JobId]) REFERENCES [statistics].[DimJob] ([JobId])
+  [TaskId]             UNIQUEIDENTIFIER NOT NULL,
+  [CalculatingTime]    INT              NOT NULL,
+  [WaitingTime]        INT              NOT NULL,
+  [TransferTime]       INT              NOT NULL,
+  [NumCalculationRuns] INT              NOT NULL,
+  [NumRetries]         INT              NOT NULL,
+  [CoresRequired]      INT              NOT NULL,
+  [MemoryRequired]     INT              NOT NULL,
+  [Priority]           INT              NOT NULL,
+  [LastClientId]       UNIQUEIDENTIFIER NULL,
+  [JobId]          UNIQUEIDENTIFIER NOT NULL,
+  [StartTime]          DATETIME         NULL,
+  [EndTime]            DATETIME         NULL,
+  [TaskState]          VARCHAR (30)     NOT NULL,
+  [Exception]          VARCHAR (MAX)    NULL,
+  [InitialWaitingTime] INT              NULL,
+  CONSTRAINT [PK_FactTask] PRIMARY KEY CLUSTERED ([TaskId] ASC),
+  CONSTRAINT [FK_FactTask_DimClient] FOREIGN KEY ([LastClientId]) REFERENCES [statistics].[DimClient] ([Id]),
+  CONSTRAINT [FK_FactTask_DimJob] FOREIGN KEY ([JobId]) REFERENCES [statistics].[DimJob] ([JobId])
 );