From e075a18a7278fef25554d532c4d7f89153b00acc Mon Sep 17 00:00:00 2001 From: Michael Ahern Date: Sat, 24 Jan 2015 18:01:12 -0500 Subject: [PATCH 1/2] Update CreateTables.sql Adding missing RecentlyUsedActivations column to OrleansSiloMetricsTable. Normalizing indentation. --- .../SQLServer/CreateTables.sql | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/src/OrleansProviders/SQLServer/CreateTables.sql b/src/OrleansProviders/SQLServer/CreateTables.sql index dc21181ec5d..7b5443a5e2f 100644 --- a/src/OrleansProviders/SQLServer/CreateTables.sql +++ b/src/OrleansProviders/SQLServer/CreateTables.sql @@ -7,7 +7,7 @@ DROP TABLE [dbo].[OrleansStatisticsTable] CREATE TABLE [dbo].[OrleansMembershipTable] ( - [DeploymentId] NVARCHAR(150) NOT NULL, + [DeploymentId] NVARCHAR(150) NOT NULL, [Address] NVARCHAR(150) NOT NULL, [Port] INT NOT NULL, [Generation] INT NOT NULL, @@ -23,34 +23,34 @@ CREATE TABLE [dbo].[OrleansMembershipTable] [SuspectingTimes] NTEXT NULL, [StartTime] DATETIME NOT NULL, [IAmAliveTime] DATETIME NOT NULL, - [ETag] NVARCHAR(50) NOT NULL, + [ETag] NVARCHAR(50) NOT NULL, PRIMARY KEY ([DeploymentId],[Address],[Port],[Generation]) ) CREATE TABLE [dbo].[OrleansMembershipVersionTable] ( - [DeploymentId] NVARCHAR(150) NOT NULL, + [DeploymentId] NVARCHAR(150) NOT NULL, [TimeStamp] DATETIME NOT NULL, [Version] BIGINT NOT NULL, - [ETag] NVARCHAR(50) NOT NULL, + [ETag] NVARCHAR(50) NOT NULL, PRIMARY KEY ([DeploymentId]) ) CREATE TABLE [dbo].[OrleansRemindersTable] ( - [ServiceId] NVARCHAR(150) NOT NULL, + [ServiceId] NVARCHAR(150) NOT NULL, [GrainId] NVARCHAR(150) NOT NULL, - [ReminderName] NVARCHAR(150) NOT NULL, + [ReminderName] NVARCHAR(150) NOT NULL, [StartTime] DATETIME NOT NULL, [Period] INT NOT NULL, - [GrainIdConsistentHash] INT NOT NULL, - [ETag] NVARCHAR(50) NOT NULL, + [GrainIdConsistentHash] INT NOT NULL, + [ETag] NVARCHAR(50) NOT NULL, PRIMARY KEY ([ServiceId],[GrainId],[ReminderName]) ) CREATE TABLE [dbo].[OrleansSiloMetricsTable] ( - [DeploymentId] NVARCHAR(150) NOT NULL, + [DeploymentId] NVARCHAR(150) NOT NULL, [SiloId] NVARCHAR(150) NOT NULL, [TimeStamp] DATETIME NOT NULL, [Address] NVARCHAR(50) NOT NULL, @@ -59,39 +59,40 @@ CREATE TABLE [dbo].[OrleansSiloMetricsTable] [HostName] NVARCHAR(150) NOT NULL, [GatewayAddress] NVARCHAR(50) NULL, [GatewayPort] INT NULL, - [CPU] FLOAT NOT NULL, - [Memory] BIGINT NOT NULL, - [Activations] INT NOT NULL, + [CPU] FLOAT NOT NULL, + [Memory] BIGINT NOT NULL, + [Activations] INT NOT NULL, + [RecentlyUsedActivations] INT NOT NULL, [SendQueue] INT NOT NULL, [ReceiveQueue] INT NOT NULL, - [RequestQueue] BIGINT NOT NULL, - [SentMessages] BIGINT NOT NULL, - [ReceivedMessages] BIGINT NOT NULL, - [LoadShedding] BIT NOT NULL, - [ClientCount] BIGINT NOT NULL, + [RequestQueue] BIGINT NOT NULL, + [SentMessages] BIGINT NOT NULL, + [ReceivedMessages] BIGINT NOT NULL, + [LoadShedding] BIT NOT NULL, + [ClientCount] BIGINT NOT NULL, PRIMARY KEY ([DeploymentId],[SiloId]) ) CREATE TABLE [dbo].[OrleansClientMetricsTable] ( - [DeploymentId] NVARCHAR(150) NOT NULL, + [DeploymentId] NVARCHAR(150) NOT NULL, [ClientId] NVARCHAR(150) NOT NULL, [TimeStamp] DATETIME NOT NULL, [Address] NVARCHAR(50) NOT NULL, [HostName] NVARCHAR(150) NOT NULL, - [CPU] FLOAT NOT NULL, - [Memory] BIGINT NOT NULL, + [CPU] FLOAT NOT NULL, + [Memory] BIGINT NOT NULL, [SendQueue] INT NOT NULL, [ReceiveQueue] INT NOT NULL, - [SentMessages] BIGINT NOT NULL, - [ReceivedMessages] BIGINT NOT NULL, - [ConnectedGWCount] BIGINT NOT NULL, + [SentMessages] BIGINT NOT NULL, + [ReceivedMessages] BIGINT NOT NULL, + [ConnectedGWCount] BIGINT NOT NULL, PRIMARY KEY ([DeploymentId],[ClientId]) ) CREATE TABLE [dbo].[OrleansStatisticsTable] ( - [DeploymentId] NVARCHAR(150) NOT NULL, + [DeploymentId] NVARCHAR(150) NOT NULL, [Date] DATE NOT NULL, [TimeStamp] DATETIME NOT NULL, [Id] NVARCHAR(250) NOT NULL, @@ -99,8 +100,8 @@ CREATE TABLE [dbo].[OrleansStatisticsTable] [HostName] NVARCHAR(150) NOT NULL, [Name] NVARCHAR(150) NULL, [IsDelta] BIT NULL, - [StatValue] NVARCHAR(250) NOT NULL, - [Statistic] NVARCHAR(250) NOT NULL, + [StatValue] NVARCHAR(250) NOT NULL, + [Statistic] NVARCHAR(250) NOT NULL, PRIMARY KEY ([DeploymentId],[Date],[Id],[Counter]) ) From 78c52f3d62f35b6f25c92800ac158f2988044ba7 Mon Sep 17 00:00:00 2001 From: Michael Ahern Date: Sat, 24 Jan 2015 18:27:18 -0500 Subject: [PATCH 2/2] Update CreateTables.sql ConnectedGWCount column was renamed to ConnectedGatewayCount in OrleansClientMetricsTable. --- src/OrleansProviders/SQLServer/CreateTables.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrleansProviders/SQLServer/CreateTables.sql b/src/OrleansProviders/SQLServer/CreateTables.sql index 7b5443a5e2f..2bfca2ec112 100644 --- a/src/OrleansProviders/SQLServer/CreateTables.sql +++ b/src/OrleansProviders/SQLServer/CreateTables.sql @@ -86,7 +86,7 @@ CREATE TABLE [dbo].[OrleansClientMetricsTable] [ReceiveQueue] INT NOT NULL, [SentMessages] BIGINT NOT NULL, [ReceivedMessages] BIGINT NOT NULL, - [ConnectedGWCount] BIGINT NOT NULL, + [ConnectedGatewayCount] BIGINT NOT NULL, PRIMARY KEY ([DeploymentId],[ClientId]) )