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

Timestamp:

06/19/15 18:06:19 (9 years ago)

Author:

dglaser

Message:

#2388: Updated Hive, DataAccess and WebApp

HeuristicLab.Services.Hive.DataAccess:

• Updated database statistics schema

HeuristicLab.Services.Hive:

• Fixed event flag in HiveJanitor Service
• Improved UpdateTaskFactsTable in the HiveStatisticsGenerator

HeuristicLab.Services.WebApp:

• Updated Statistics DataController to match the new statistics schema

File:

• branches/HiveStatistics/sources/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

@@ -202 +202 @@
 
 CREATE TABLE [statistics].[DimTime] (
-    [Time]  DATETIME NOT NULL,
-    [Hour]  DATETIME NOT NULL,
-    [Day]   DATE     NOT NULL,
-    [Month] DATE     NOT NULL,
-    [Year]  DATE     NOT NULL,
+    [Time]   DATETIME NOT NULL,
+    [Minute] DATETIME NOT NULL,
+    [Hour]   DATETIME NOT NULL,
+    [Day]    DATE     NOT NULL,
+    [Month]  DATE     NOT NULL,
+    [Year]   DATE     NOT NULL,
     CONSTRAINT [PK_DimTime] PRIMARY KEY CLUSTERED ([Time] ASC)
 );
@@ -223 +224 @@
     [JobName]     VARCHAR (MAX)    NOT NULL,
     [UserName]    VARCHAR (MAX)    NOT NULL,
-  [DateCreated] DATETIME       NOT NULL,
+    [DateCreated] DATETIME       NOT NULL,
     CONSTRAINT [PK_DimJob] PRIMARY KEY CLUSTERED ([JobId] ASC)
 );
@@ -252 +253 @@
 );
 CREATE TABLE [statistics].[FactTask] (
-    [TaskId]             UNIQUEIDENTIFIER NOT NULL,
-    [TotalRuntime]       FLOAT (53)       NOT NULL,
-    [TotalWaitingTime]   FLOAT (53)       NOT NULL,
-    [TotalTransferTime]  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         NOT NULL,
-    [EndTime]            DATETIME         NULL,
-    [TaskState]          VARCHAR (30)     NOT NULL,
-    [Exception]      VARCHAR (MAX)    NULL,
+    [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]),
-    CONSTRAINT [FK_FactTask_DimTimeStart] FOREIGN KEY ([StartTime]) REFERENCES [statistics].[DimTime] ([Time]),
-    CONSTRAINT [FK_FactTask_DimTimeEnd] FOREIGN KEY ([EndTime]) REFERENCES [statistics].[DimTime] ([Time])
+    CONSTRAINT [FK_FactTask_DimJob] FOREIGN KEY ([JobId]) REFERENCES [statistics].[DimJob] ([JobId])
 );