From 6f3f9d544c3527d97e5f874b05d582031ffe2240 Mon Sep 17 00:00:00 2001 From: Tomasz Strejczek Date: Sun, 25 Aug 2024 16:28:35 +0200 Subject: [PATCH 1/2] Add missing query CleanupDefunctSiloEntriesKey to PostgreSQL-Clustering.sql --- .../PostgreSQL-Clustering.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/AdoNet/Orleans.Clustering.AdoNet/PostgreSQL-Clustering.sql b/src/AdoNet/Orleans.Clustering.AdoNet/PostgreSQL-Clustering.sql index 2d2c0a20a2..459e76b579 100644 --- a/src/AdoNet/Orleans.Clustering.AdoNet/PostgreSQL-Clustering.sql +++ b/src/AdoNet/Orleans.Clustering.AdoNet/PostgreSQL-Clustering.sql @@ -344,3 +344,14 @@ VALUES AND Status = @Status AND @Status IS NOT NULL AND ProxyPort > 0; '); + +INSERT INTO OrleansQuery(QueryKey, QueryText) +VALUES +( + 'CleanupDefunctSiloEntriesKey', + 'DELETE FROM OrleansMembershipTable + WHERE DeploymentId = @DeploymentId + AND @DeploymentId IS NOT NULL + AND IAmAliveTime < @IAmAliveTime + AND Status != 3; +'); From 33611988776591ad33d874a5fa3f69438784cc50 Mon Sep 17 00:00:00 2001 From: Tomasz Strejczek Date: Fri, 11 Oct 2024 19:27:06 +0200 Subject: [PATCH 2/2] Migration scripts from 3.6.0 and 3.7.0 should not particiate in building test database --- .../RelationalUtilities/RelationalStorageForTesting.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/Extensions/TesterAdoNet/RelationalUtilities/RelationalStorageForTesting.cs b/test/Extensions/TesterAdoNet/RelationalUtilities/RelationalStorageForTesting.cs index 839f127471..7a08666638 100644 --- a/test/Extensions/TesterAdoNet/RelationalUtilities/RelationalStorageForTesting.cs +++ b/test/Extensions/TesterAdoNet/RelationalUtilities/RelationalStorageForTesting.cs @@ -51,12 +51,7 @@ public virtual string StreamTestInsert $"{this.ProviderMoniker}-Persistence.sql", $"{this.ProviderMoniker}-Reminders.sql", $"{this.ProviderMoniker}-Streaming.sql", - }.Concat(Directory.GetFiles(Environment.CurrentDirectory, $"{this.ProviderMoniker}-Clustering-*.sql") - .Concat(Directory.GetFiles(Environment.CurrentDirectory, $"{this.ProviderMoniker}-Persistence-*.sql")) - .Concat(Directory.GetFiles(Environment.CurrentDirectory, $"{this.ProviderMoniker}-Reminders-*.sql")) - .Concat(Directory.GetFiles(Environment.CurrentDirectory, $"{this.ProviderMoniker}-Streaming-*.sql")) - .Select(f => Path.GetFileName(f)) - .OrderBy(f => f)).ToArray(); + }; /// /// A query template to create a database with a given name.