migrate id's from int to long (#104)

schmitch · vytautask · commit 11152c84e0f1 · 2019-05-03T20:51:46.000+03:00
diff --git a/src/Hangfire.PostgreSql/Entities/JobParameter.cs b/src/Hangfire.PostgreSql/Entities/JobParameter.cs
@@ -26,7 +26,7 @@ namespace Hangfire.PostgreSql.Entities
     [UsedImplicitly]
     internal class JobParameter
     {
-        public int JobId { get; set; }
+        public long JobId { get; set; }
         public string Name { get; set; }
         public string Value { get; set; }
     }
diff --git a/src/Hangfire.PostgreSql/Entities/SqlHash.cs b/src/Hangfire.PostgreSql/Entities/SqlHash.cs
@@ -27,7 +27,7 @@ namespace Hangfire.PostgreSql.Entities
     [UsedImplicitly]
     internal class SqlHash
     {
-        public int Id { get; set; }
+        public long Id { get; set; }
         public string Key { get; set; }
         public string Field { get; set; }
         public string Value { get; set; }
diff --git a/src/Hangfire.PostgreSql/Entities/SqlJob.cs b/src/Hangfire.PostgreSql/Entities/SqlJob.cs
@@ -1,5 +1,5 @@
 // This file is part of Hangfire.PostgreSql.
-// Copyright � 2014 Frank Hommers <http://hmm.rs/Hangfire.PostgreSql>.
+// Copyright � 2014 Frank Hommers <http://hmm.rs/Hangfire.PostgreSql>.
 // 
 // Hangfire.PostgreSql is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Lesser General Public License as 
@@ -27,7 +27,7 @@ namespace Hangfire.PostgreSql.Entities
     [UsedImplicitly]
     internal class SqlJob
     {
-        public int Id { get; set; }
+        public long Id { get; set; }
         public string InvocationData { get; set; }
         public string Arguments { get; set; }
         public DateTime CreatedAt { get; set; }
diff --git a/src/Hangfire.PostgreSql/Entities/SqlState.cs b/src/Hangfire.PostgreSql/Entities/SqlState.cs
@@ -27,7 +27,7 @@ namespace Hangfire.PostgreSql.Entities
     [UsedImplicitly]
     internal class SqlState
     {
-        public int JobId { get; set; }
+        public long JobId { get; set; }
         public string Name { get; set; }
         public string Reason { get; set; }
         public DateTime CreatedAt { get; set; }
diff --git a/src/Hangfire.PostgreSql/IPersistentJobQueueMonitoringApi.cs b/src/Hangfire.PostgreSql/IPersistentJobQueueMonitoringApi.cs
@@ -26,8 +26,8 @@ namespace Hangfire.PostgreSql
     public interface IPersistentJobQueueMonitoringApi
     {
         IEnumerable<string> GetQueues();
-        IEnumerable<int> GetEnqueuedJobIds(string queue, int from, int perPage);
-        IEnumerable<int> GetFetchedJobIds(string queue, int from, int perPage);
+        IEnumerable<long> GetEnqueuedJobIds(string queue, int from, int perPage);
+        IEnumerable<long> GetFetchedJobIds(string queue, int from, int perPage);
         EnqueuedAndFetchedCountDto GetEnqueuedAndFetchedCount(string queue);
     }
 }
diff --git a/src/Hangfire.PostgreSql/Install.v11.sql b/src/Hangfire.PostgreSql/Install.v11.sql
@@ -0,0 +1,33 @@
+SET search_path = 'hangfire';
+
+
+
+DO
+$$
+BEGIN
+  IF EXISTS (SELECT 1 FROM "schema" WHERE "version"::integer >= 11) THEN
+    RAISE EXCEPTION 'version-already-applied';
+  END IF;
+END
+$$;
+
+ALTER TABLE hangfire.counter ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.counter_id_seq AS BIGINT; 
+ALTER TABLE hangfire.hash ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.hash_id_seq AS BIGINT;
+ALTER TABLE hangfire.job ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.job_id_seq AS BIGINT;
+ALTER TABLE hangfire.job ALTER COLUMN stateid TYPE BIGINT;
+ALTER TABLE hangfire.state ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.state_id_seq AS BIGINT;
+ALTER TABLE hangfire.state ALTER COLUMN jobid TYPE BIGINT;
+ALTER TABLE hangfire.jobparameter ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.jobparameter_id_seq AS BIGINT;
+ALTER TABLE hangfire.jobparameter ALTER COLUMN jobid TYPE BIGINT;
+ALTER TABLE hangfire.jobqueue ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.jobqueue_id_seq AS BIGINT;
+ALTER TABLE hangfire.jobqueue ALTER COLUMN jobid TYPE BIGINT;
+ALTER TABLE hangfire.list ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.list_id_seq AS BIGINT;
+ALTER TABLE hangfire.set ALTER COLUMN id TYPE BIGINT;
+ALTER SEQUENCE hangfire.set_id_seq AS BIGINT;
diff --git a/src/Hangfire.PostgreSql/PostgreSqlConnection.cs b/src/Hangfire.PostgreSql/PostgreSqlConnection.cs
@@ -128,7 +128,7 @@ public override string CreateExpiredJob(
 
 			var invocationData = InvocationData.Serialize(job);
 
-			var jobId = _connection.Query<int>(
+			var jobId = _connection.Query<long>(
 				createJobSql,
 				new
 				{
diff --git a/src/Hangfire.PostgreSql/PostgreSqlFetchedJob.cs b/src/Hangfire.PostgreSql/PostgreSqlFetchedJob.cs
@@ -42,7 +42,7 @@ class PostgreSqlFetchedJob : IFetchedJob
         public PostgreSqlFetchedJob(
             IDbConnection connection, 
             PostgreSqlStorageOptions options,
-            int id, 
+            long id, 
             string jobId, 
             string queue)
         {
@@ -59,7 +59,7 @@ public PostgreSqlFetchedJob(
             Queue = queue;
         }
 
-        public int Id { get; private set; }
+        public long Id { get; private set; }
         public string JobId { get; private set; }
         public string Queue { get; private set; }
 
diff --git a/src/Hangfire.PostgreSql/PostgreSqlJobQueue.cs b/src/Hangfire.PostgreSql/PostgreSqlJobQueue.cs
@@ -239,8 +239,8 @@ public void Enqueue(string queue, string jobId)
 		[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
 		private class FetchedJob
 		{
-			public int Id { get; set; }
-			public int JobId { get; set; }
+			public long Id { get; set; }
+			public long JobId { get; set; }
 			public string Queue { get; set; }
 			public DateTime? FetchedAt { get; set; }
 			public int UpdateCount { get; set; }
diff --git a/src/Hangfire.PostgreSql/PostgreSqlJobQueueMonitoringApi.cs b/src/Hangfire.PostgreSql/PostgreSqlJobQueueMonitoringApi.cs
@@ -50,12 +50,12 @@ SELECT DISTINCT ""queue""
             return _connection.Query(sqlQuery).Select(x => (string)x.queue).ToList();
         }
 
-        public IEnumerable<int> GetEnqueuedJobIds(string queue, int @from, int perPage)
+        public IEnumerable<long> GetEnqueuedJobIds(string queue, int @from, int perPage)
         {
             return GetQueuedOrFetchedJobIds(queue, false, @from, perPage);
         }
 
-        private IEnumerable<int> GetQueuedOrFetchedJobIds(string queue, bool fetched, int @from, int perPage)
+        private IEnumerable<long> GetQueuedOrFetchedJobIds(string queue, bool fetched, int @from, int perPage)
         {
             string sqlQuery = string.Format(@"
 SELECT j.""id"" 
@@ -67,13 +67,13 @@ AND j.""id"" IS NOT NULL
 LIMIT @count OFFSET @start;
 ", fetched ? "IS NOT NULL" : "IS NULL");
 
-            return _connection.Query<int>(
+            return _connection.Query<long>(
                 sqlQuery,
                 new {queue = queue, start = @from, count = perPage})
                 .ToList();
         }
 
-        public IEnumerable<int> GetFetchedJobIds(string queue, int @from, int perPage)
+        public IEnumerable<long> GetFetchedJobIds(string queue, int @from, int perPage)
         {
             return GetQueuedOrFetchedJobIds(queue, true, @from, perPage);
         }
diff --git a/src/Hangfire.PostgreSql/PostgreSqlMonitoringApi.cs b/src/Hangfire.PostgreSql/PostgreSqlMonitoringApi.cs
@@ -473,7 +473,7 @@ private T UseConnection<T>(Func<NpgsqlConnection, T> action)
             }
         }
 
-        private JobList<EnqueuedJobDto> EnqueuedJobs(NpgsqlConnection connection, IEnumerable<int> jobIds)
+        private JobList<EnqueuedJobDto> EnqueuedJobs(NpgsqlConnection connection, IEnumerable<long> jobIds)
         {
             string enqueuedJobsSql = @"
 SELECT j.""id"" ""Id"", j.""invocationdata"" ""InvocationData"", j.""arguments"" ""Arguments"", j.""createdat"" ""CreatedAt"", j.""expireat"" ""ExpireAt"", s.""name"" ""StateName"", s.""reason"" ""StateReason"", s.""data"" ""StateData""
@@ -581,7 +581,7 @@ private static JobList<TDto> DeserializeJobs<TDto>(
 
         private JobList<FetchedJobDto> FetchedJobs(
             NpgsqlConnection connection,
-            IEnumerable<int> jobIds)
+            IEnumerable<long> jobIds)
         {
             string fetchedJobsSql = @"
 SELECT j.""id"" ""Id"", j.""invocationdata"" ""InvocationData"", j.""arguments"" ""Arguments"", j.""createdat"" ""CreatedAt"", 
diff --git a/tests/Hangfire.PostgreSql.Tests/ExpirationManagerFacts.cs b/tests/Hangfire.PostgreSql.Tests/ExpirationManagerFacts.cs
@@ -201,7 +201,7 @@ public void Execute_Processes_HashTable()
             }
         }
 
-        private static int CreateExpirationEntry(NpgsqlConnection connection, DateTime? expireAt)
+        private static long CreateExpirationEntry(NpgsqlConnection connection, DateTime? expireAt)
         {
             string insertSqlNull = @"
 insert into """ + GetSchemaName() + @""".""counter""(""key"", ""value"", ""expireat"")
@@ -217,11 +217,11 @@ private static int CreateExpirationEntry(NpgsqlConnection connection, DateTime?
                     ((long)(DateTime.UtcNow - expireAt.Value).TotalSeconds).ToString(CultureInfo.InvariantCulture));
 
             var id = connection.Query(insertSql).Single();
-            var recordId = (int)id.id;
+            var recordId = (long)id.id;
             return recordId;
         }
 
-        private static bool IsEntryExpired(NpgsqlConnection connection, int entryId)
+        private static bool IsEntryExpired(NpgsqlConnection connection, long entryId)
         {
             var count = connection.Query<long>(
                 @"select count(*) from """ + GetSchemaName() + @""".""counter"" where ""id"" = @id", new { id = entryId }).Single();
diff --git a/tests/Hangfire.PostgreSql.Tests/PostgreSqlConnectionFacts.cs b/tests/Hangfire.PostgreSql.Tests/PostgreSqlConnectionFacts.cs
@@ -191,7 +191,7 @@ public void CreateExpiredJob_CreatesAJobInTheStorage_AndSetsItsParameters()
 				var sqlJob = sql.Query(@"select * from """ + GetSchemaName() + @""".""job""").Single();
 				Assert.Equal(jobId, sqlJob.id.ToString());
 				Assert.Equal(createdAt, sqlJob.createdat);
-				Assert.Null((int?) sqlJob.stateid);
+				Assert.Null((long?) sqlJob.stateid);
 				Assert.Null((string) sqlJob.statename);
 
 				var invocationData = JobHelper.FromJson<InvocationData>((string) sqlJob.invocationdata);
@@ -243,7 +243,7 @@ public void GetJobData_ReturnsResult_WhenJobExists()
 			{
 				var job = Job.FromExpression(() => SampleMethod("wrong"));
 
-                var jobId = (int) sql.Query(
+                var jobId = (long) sql.Query(
 					arrangeSql,
 					new
 					{
@@ -312,9 +312,9 @@ public void GetStateData_ReturnsCorrectData()
 					{"Key", "Value"}
 				};
 
-				var jobId = (int) sql.Query(createJobSql).Single().id;
+				var jobId = (long) sql.Query(createJobSql).Single().id;
 
-				var stateId = (int) sql.Query(
+				var stateId = (long) sql.Query(
 					createStateSql,
 					new {jobId = jobId, name = "Name", reason = "Reason", @data = JobHelper.ToJson(data)}).Single().id;
 
@@ -347,7 +347,7 @@ public void GetJobData_ReturnsJobLoadException_IfThereWasADeserializationExcepti
 						arguments = "['Arguments']"
 					}).Single();
 
-				var result = connection.GetJobData(((int) jobId.id).ToString());
+				var result = connection.GetJobData(((long) jobId.id).ToString());
 
 				Assert.NotNull(result.LoadException);
 			});
@@ -493,7 +493,7 @@ public void GetParameter_ReturnsParameterValue_WhenJobExists()
 ";
 			UseConnections((sql, connection) =>
 			{
-				var id = sql.Query<int>(
+				var id = sql.Query<long>(
 					arrangeSql,
 					new {name = "name", value = "value"}).Single();
 
diff --git a/tests/Hangfire.PostgreSql.Tests/PostgreSqlFetchedJobFacts.cs b/tests/Hangfire.PostgreSql.Tests/PostgreSqlFetchedJobFacts.cs
@@ -146,14 +146,14 @@ public void Dispose_SetsFetchedAtValueToNull_IfThereWereNoCallsToComplete()
 			});
 		}
 
-		private static int CreateJobQueueRecord(IDbConnection connection, string jobId, string queue)
+		private static long CreateJobQueueRecord(IDbConnection connection, string jobId, string queue)
 		{
 			string arrangeSql = @"
 insert into """ + GetSchemaName() + @""".""jobqueue"" (""jobid"", ""queue"", ""fetchedat"")
 values (@id, @queue, now() at time zone 'utc') returning ""id""";
 
 			return
-				(int)
+				(long)
 					connection.Query(arrangeSql, new {id = Convert.ToInt32(jobId, CultureInfo.InvariantCulture), queue = queue})
 						.Single()
 						.id;
diff --git a/tests/Hangfire.PostgreSql.Tests/PostgreSqlJobQueueFacts.cs b/tests/Hangfire.PostgreSql.Tests/PostgreSqlJobQueueFacts.cs
@@ -162,7 +162,7 @@ private void Dequeue_ShouldFetchAJob_FromTheSpecifiedQueue(bool useNativeDatabas
 			// Arrange
 			UseConnection(connection =>
 			{
-				var id = (int) connection.Query(
+				var id = (long) connection.Query(
 					arrangeSql,
 					new {jobId = 1, queue = "default"}).Single().id;
 				var queue = CreateJobQueue(connection, useNativeDatabaseTransactions);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace Hangfire.PostgreSql.Entities`
`26`	`26`	`[UsedImplicitly]`
`27`	`27`	`internal class JobParameter`
`28`	`28`	`{`
`29`		`- public int JobId { get; set; }`
	`29`	`+ public long JobId { get; set; }`
`30`	`30`	`public string Name { get; set; }`
`31`	`31`	`public string Value { get; set; }`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace Hangfire.PostgreSql.Entities`
`27`	`27`	`[UsedImplicitly]`
`28`	`28`	`internal class SqlHash`
`29`	`29`	`{`
`30`		`- public int Id { get; set; }`
	`30`	`+ public long Id { get; set; }`
`31`	`31`	`public string Key { get; set; }`
`32`	`32`	`public string Field { get; set; }`
`33`	`33`	`public string Value { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ namespace Hangfire.PostgreSql`
`26`	`26`	`public interface IPersistentJobQueueMonitoringApi`
`27`	`27`	`{`
`28`	`28`	`IEnumerable<string> GetQueues();`
`29`		`- IEnumerable<int> GetEnqueuedJobIds(string queue, int from, int perPage);`
`30`		`- IEnumerable<int> GetFetchedJobIds(string queue, int from, int perPage);`
	`29`	`+ IEnumerable<long> GetEnqueuedJobIds(string queue, int from, int perPage);`
	`30`	`+ IEnumerable<long> GetFetchedJobIds(string queue, int from, int perPage);`
`31`	`31`	`EnqueuedAndFetchedCountDto GetEnqueuedAndFetchedCount(string queue);`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public override string CreateExpiredJob(`
`128`	`128`
`129`	`129`	`var invocationData = InvocationData.Serialize(job);`
`130`	`130`
`131`		`- var jobId = _connection.Query<int>(`
	`131`	`+ var jobId = _connection.Query<long>(`
`132`	`132`	`createJobSql,`
`133`	`133`	`new`
`134`	`134`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,12 @@ SELECT DISTINCT ""queue""`
`50`	`50`	`return _connection.Query(sqlQuery).Select(x => (string)x.queue).ToList();`
`51`	`51`	`}`
`52`	`52`
`53`		`- public IEnumerable<int> GetEnqueuedJobIds(string queue, int @from, int perPage)`
	`53`	`+ public IEnumerable<long> GetEnqueuedJobIds(string queue, int @from, int perPage)`
`54`	`54`	`{`
`55`	`55`	`return GetQueuedOrFetchedJobIds(queue, false, @from, perPage);`
`56`	`56`	`}`
`57`	`57`
`58`		`- private IEnumerable<int> GetQueuedOrFetchedJobIds(string queue, bool fetched, int @from, int perPage)`
	`58`	`+ private IEnumerable<long> GetQueuedOrFetchedJobIds(string queue, bool fetched, int @from, int perPage)`
`59`	`59`	`{`
`60`	`60`	`string sqlQuery = string.Format(@"`
`61`	`61`	`SELECT j.""id""`
`@@ -67,13 +67,13 @@ AND j.""id"" IS NOT NULL`
`67`	`67`	`LIMIT @count OFFSET @start;`
`68`	`68`	`", fetched ? "IS NOT NULL" : "IS NULL");`
`69`	`69`
`70`		`- return _connection.Query<int>(`
	`70`	`+ return _connection.Query<long>(`
`71`	`71`	`sqlQuery,`
`72`	`72`	`new {queue = queue, start = @from, count = perPage})`
`73`	`73`	`.ToList();`
`74`	`74`	`}`
`75`	`75`
`76`		`- public IEnumerable<int> GetFetchedJobIds(string queue, int @from, int perPage)`
	`76`	`+ public IEnumerable<long> GetFetchedJobIds(string queue, int @from, int perPage)`
`77`	`77`	`{`
`78`	`78`	`return GetQueuedOrFetchedJobIds(queue, true, @from, perPage);`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ private T UseConnection<T>(Func<NpgsqlConnection, T> action)`
`473`	`473`	`}`
`474`	`474`	`}`
`475`	`475`
`476`		`- private JobList<EnqueuedJobDto> EnqueuedJobs(NpgsqlConnection connection, IEnumerable<int> jobIds)`
	`476`	`+ private JobList<EnqueuedJobDto> EnqueuedJobs(NpgsqlConnection connection, IEnumerable<long> jobIds)`
`477`	`477`	`{`
`478`	`478`	`string enqueuedJobsSql = @"`
`479`	`479`	`SELECT j.""id"" ""Id"", j.""invocationdata"" ""InvocationData"", j.""arguments"" ""Arguments"", j.""createdat"" ""CreatedAt"", j.""expireat"" ""ExpireAt"", s.""name"" ""StateName"", s.""reason"" ""StateReason"", s.""data"" ""StateData""`
`@@ -581,7 +581,7 @@ private static JobList<TDto> DeserializeJobs<TDto>(`
`581`	`581`
`582`	`582`	`private JobList<FetchedJobDto> FetchedJobs(`
`583`	`583`	`NpgsqlConnection connection,`
`584`		`- IEnumerable<int> jobIds)`
	`584`	`+ IEnumerable<long> jobIds)`
`585`	`585`	`{`
`586`	`586`	`string fetchedJobsSql = @"`
`587`	`587`	`SELECT j.""id"" ""Id"", j.""invocationdata"" ""InvocationData"", j.""arguments"" ""Arguments"", j.""createdat"" ""CreatedAt"",`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public void Execute_Processes_HashTable()`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
`204`		`- private static int CreateExpirationEntry(NpgsqlConnection connection, DateTime? expireAt)`
	`204`	`+ private static long CreateExpirationEntry(NpgsqlConnection connection, DateTime? expireAt)`
`205`	`205`	`{`
`206`	`206`	`string insertSqlNull = @"`
`207`	`207`	`insert into """ + GetSchemaName() + @""".""counter""(""key"", ""value"", ""expireat"")`
`@@ -217,11 +217,11 @@ private static int CreateExpirationEntry(NpgsqlConnection connection, DateTime?`
`217`	`217`	`((long)(DateTime.UtcNow - expireAt.Value).TotalSeconds).ToString(CultureInfo.InvariantCulture));`
`218`	`218`
`219`	`219`	`var id = connection.Query(insertSql).Single();`
`220`		`- var recordId = (int)id.id;`
	`220`	`+ var recordId = (long)id.id;`
`221`	`221`	`return recordId;`
`222`	`222`	`}`
`223`	`223`
`224`		`- private static bool IsEntryExpired(NpgsqlConnection connection, int entryId)`
	`224`	`+ private static bool IsEntryExpired(NpgsqlConnection connection, long entryId)`
`225`	`225`	`{`
`226`	`226`	`var count = connection.Query<long>(`
`227`	`227`	`@"select count(*) from """ + GetSchemaName() + @""".""counter"" where ""id"" = @id", new { id = entryId }).Single();`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private void Dequeue_ShouldFetchAJob_FromTheSpecifiedQueue(bool useNativeDatabas`
`162`	`162`	`// Arrange`
`163`	`163`	`UseConnection(connection =>`
`164`	`164`	`{`
`165`		`- var id = (int) connection.Query(`
	`165`	`+ var id = (long) connection.Query(`
`166`	`166`	`arrangeSql,`
`167`	`167`	`new {jobId = 1, queue = "default"}).Single().id;`
`168`	`168`	`var queue = CreateJobQueue(connection, useNativeDatabaseTransactions);`